[vpopmail-cvs] vpopmail vmysql.c,1.15,1.15.2.1 ChangeLog,1.103.2.15,1.103.2.16

[Tom C. <tom...@us...>]

Update of /cvsroot/vpopmail/vpopmail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27411

Modified Files:
      Tag: stable-5_4
	vmysql.c ChangeLog 
Log Message:
Fix method used to open database in vauth_open_update of vmysql.c. [967994, 946983]

Index: vmysql.c
===================================================================
RCS file: /cvsroot/vpopmail/vpopmail/vmysql.c,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -d -r1.15 -r1.15.2.1
--- vmysql.c	13 Jan 2004 23:56:41 -0000	1.15
+++ vmysql.c	11 Jun 2004 15:52:28 -0000	1.15.2.1
@@ -203,41 +203,36 @@
     mysql_init(&mysql_update);
     mysql_options(&mysql_update, MYSQL_OPT_CONNECT_TIMEOUT, (char *)&timeout);
 
-    /* Try to connect to the mysql update server with the specified database. */
+    /* Try to connect to the mysql update server */
     if (!(mysql_real_connect(&mysql_update, MYSQL_UPDATE_SERVER,
-            MYSQL_UPDATE_USER, MYSQL_UPDATE_PASSWD,
-            MYSQL_UPDATE_DATABASE, MYSQL_UPDATE_PORT, NULL, 0))) {
-
-        /* Could not connect to the update mysql server with the database
-         * so try to connect with no database specified
-         */
-        if (!(mysql_real_connect(&mysql_update, MYSQL_UPDATE_SERVER,
-                MYSQL_UPDATE_USER, MYSQL_UPDATE_PASSWD, NULL, MYSQL_UPDATE_PORT,
-                NULL, 0))) {
-
-            /* if we can not connect, report a error and return */
-            verrori = VA_NO_AUTH_CONNECTION;
-            return(VA_NO_AUTH_CONNECTION);
-        }
-
-        /* we were able to connect, so create the database */ 
-        snprintf( SqlBufUpdate, SQL_BUF_SIZE, 
-            "create database %s", MYSQL_UPDATE_DATABASE );
-        if (mysql_query(&mysql_update,SqlBufUpdate)) {
-
-            /* we could not create the database
-             * so report the error and return 
-             */
-            fprintf(stderr, "vmysql: sql error[1]: %s\n", mysql_error(&mysql_update));
-            return(-1);
-        } 
+			     MYSQL_UPDATE_USER, MYSQL_UPDATE_PASSWD, NULL, MYSQL_UPDATE_PORT,
+			     NULL, 0))) {
+      
+      /* if we can not connect, report a error and return */
+      verrori = VA_NO_AUTH_CONNECTION;
+      return(VA_NO_AUTH_CONNECTION);
+    }
 
-        /* set the database */ 
-        if (mysql_select_db(&mysql_update, MYSQL_UPDATE_DATABASE)) {
-            fprintf(stderr, "could not enter %s database\n", MYSQL_UPDATE_DATABASE);
-            return(-1);
-        }    
+    /* set the database we use */
+    if (mysql_select_db(&mysql_update, MYSQL_UPDATE_DATABASE)) {
+      /* we were able to connect, so create the database */ 
+      snprintf( SqlBufUpdate, SQL_BUF_SIZE, 
+		"create database %s", MYSQL_UPDATE_DATABASE );
+      if (mysql_query(&mysql_update,SqlBufUpdate)) {
+	
+	/* we could not create the database
+	 * so report the error and return 
+	 */
+	fprintf(stderr, "vmysql: sql error[1]: %s\n", mysql_error(&mysql_update));
+	return(-1);
+      } 
+      /* set the database (we just created)*/ 
+      if (mysql_select_db(&mysql_update, MYSQL_UPDATE_DATABASE)) {
+	fprintf(stderr, "could not enter (just created) %s database\n", MYSQL_UPDATE_DATABASE);
+	return(-1);
+      }    
     }
+
     return(0);
 }
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/vpopmail/vpopmail/ChangeLog,v
retrieving revision 1.103.2.15
retrieving revision 1.103.2.16
diff -u -d -r1.103.2.15 -r1.103.2.16
--- ChangeLog	11 Jun 2004 04:55:50 -0000	1.103.2.15
+++ ChangeLog	11 Jun 2004 15:52:28 -0000	1.103.2.16
@@ -7,6 +7,10 @@
 	- Patch for vpgsql.c fixes bug with Postgres and roaming users
 	  (POP before SMTP). [895501]
 
+	Françoi Wautier
+	- Fix method used to open database in vauth_open_update of
+	  vmysql.c. [967994, 946983]
+
 	Tom Collins
 	- Fix `vuserinfo -l` output, based on Bill Shupp's patch
 	  (moved code to a single function call). [961742]