summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/db.c6
-rw-r--r--include/db.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/include/db.c b/include/db.c
index 9e3289b0..dd4fa1a1 100644
--- a/include/db.c
+++ b/include/db.c
@@ -17,11 +17,13 @@
* Connect to database.
* If fails, program terminates.
*/
-void DBconnect( char *dbname, char *dbuser, char *dbpassword)
+void DBconnect( char *dbname, char *dbuser, char *dbpassword, char *dbsocket)
{
/* syslog(LOG_ERR, "[%s] [%s] [%s]\n",dbname, dbuser, dbpassword ); */
#ifdef HAVE_MYSQL
- if( ! mysql_connect( &mysql, NULL, dbuser, dbpassword ) )
+/* For MySQL >3.22.00 */
+/* if( ! mysql_connect( &mysql, NULL, dbuser, dbpassword ) )*/
+ if( ! mysql_real_connect( &mysql, NULL, dbuser, dbpassword, dbname, 0, dbsocket,0 ) )
{
syslog(LOG_ERR, "Failed to connect to database: Error: %s\n",mysql_error(&mysql) );
exit( FAIL );
diff --git a/include/db.h b/include/db.h
index fb1c8130..0cf28405 100644
--- a/include/db.h
+++ b/include/db.h
@@ -1,6 +1,8 @@
#ifndef MON_DB_H
#define MON_DB_H
+/* time_t */
+#include <time.h>
#include "config.h"
#ifdef HAVE_MYSQL
@@ -93,7 +95,7 @@ DB_ACTION
};
-void DBconnect( char *dbname, char *dbuser, char *dbpassword);
+void DBconnect( char *dbname, char *dbuser, char *dbpassword, char *dbsocket);
int DBexecute( char *query );