|
@@ -1,5 +1,5 @@
|
|
|
---- plugins/mysql.c.dist Fri Mar 7 13:26:42 2003
|
|
|
|
|
-+++ plugins/mysql.c Fri Apr 4 16:55:38 2003
|
|
|
|
|
|
|
+--- plugins/mysql.c.orig Wed May 14 20:46:02 2003
|
|
|
|
|
++++ plugins/mysql.c Fri Jul 4 10:11:16 2003
|
|
|
@@ -254,6 +254,7 @@
|
|
@@ -254,6 +254,7 @@
|
|
|
MYSQL mysql,*sock = NULL;
|
|
MYSQL mysql,*sock = NULL;
|
|
|
MYSQL_RES *result;
|
|
MYSQL_RES *result;
|
|
@@ -8,23 +8,15 @@
|
|
|
|
|
|
|
|
/* setup the settings */
|
|
/* setup the settings */
|
|
|
settings = (struct mysql_settings *)glob_context;
|
|
settings = (struct mysql_settings *)glob_context;
|
|
|
-@@ -325,8 +326,15 @@
|
|
|
|
|
- sparams->utils->log(NULL, SASL_LOG_WARN,
|
|
|
|
|
|
|
+@@ -326,6 +327,7 @@
|
|
|
"mysql plugin try and connect to %s\n",
|
|
"mysql plugin try and connect to %s\n",
|
|
|
cur_host);
|
|
cur_host);
|
|
|
-+#ifdef HAVE_MYSQL_REAL_CONNECT
|
|
|
|
|
-+ mysql_init(&mysql);
|
|
|
|
|
-+ sock = mysql_real_connect(&mysql,cur_host,settings->mysql_user,
|
|
|
|
|
-+ settings->mysql_passwd,
|
|
|
|
|
-+ NULL,0,NULL,CLIENT_COMPRESS);
|
|
|
|
|
-+#else
|
|
|
|
|
- sock = mysql_connect(&mysql,cur_host,settings->mysql_user,
|
|
|
|
|
- settings->mysql_passwd);
|
|
|
|
|
-+#endif
|
|
|
|
|
- if (sock) break;
|
|
|
|
|
-
|
|
|
|
|
- cur_host = db_host;
|
|
|
|
|
-@@ -405,8 +413,10 @@
|
|
|
|
|
|
|
+
|
|
|
|
|
++ mysql_init(&mysql);
|
|
|
|
|
+ sock = mysql_real_connect(&mysql,cur_host,
|
|
|
|
|
+ settings->mysql_user,
|
|
|
|
|
+ settings->mysql_passwd,
|
|
|
|
|
+@@ -408,8 +410,10 @@
|
|
|
/* now get the result set value and value_len */
|
|
/* now get the result set value and value_len */
|
|
|
/* we only fetch one becuse we dont car about the rest */
|
|
/* we only fetch one becuse we dont car about the rest */
|
|
|
row = mysql_fetch_row(result);
|
|
row = mysql_fetch_row(result);
|
|
@@ -37,10 +29,10 @@
|
|
|
|
|
|
|
|
sparams->utils->prop_set(sparams->propctx, cur->name,
|
|
sparams->utils->prop_set(sparams->propctx, cur->name,
|
|
|
value, value_len);
|
|
value, value_len);
|
|
|
---- lib/server.c.dist Mon Apr 7 16:48:41 2003
|
|
|
|
|
-+++ lib/server.c Mon Apr 7 16:52:27 2003
|
|
|
|
|
-@@ -379,18 +379,9 @@
|
|
|
|
|
- char *c;
|
|
|
|
|
|
|
+--- lib/server.c.orig Wed Apr 16 21:36:01 2003
|
|
|
|
|
++++ lib/server.c Fri Jul 4 10:07:52 2003
|
|
|
|
|
+@@ -390,18 +390,9 @@
|
|
|
|
|
+ unsigned path_len;
|
|
|
char *config_filename=NULL;
|
|
char *config_filename=NULL;
|
|
|
int len;
|
|
int len;
|
|
|
- const sasl_callback_t *getpath_cb=NULL;
|
|
- const sasl_callback_t *getpath_cb=NULL;
|
|
@@ -58,5 +50,5 @@
|
|
|
+ result = SASL_OK;
|
|
+ result = SASL_OK;
|
|
|
+ path_to_config = "@l_sysconfdir@";
|
|
+ path_to_config = "@l_sysconfdir@";
|
|
|
|
|
|
|
|
- if ((c = strchr(path_to_config, PATHS_DELIMITER))) {
|
|
|
|
|
- *c = '\0';
|
|
|
|
|
|
|
+ c = strchr(path_to_config, PATHS_DELIMITER);
|
|
|
|
|
+
|