From: Timo Sirainen <tss@iki.fi>
Date: Fri, 23 Jul 2004 03:23:18 +0000 (+0300)
Subject: MySQL reconnection memleak fix.
X-Git-Tag: 1.1.alpha1~3753
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8305676435fbe71c5a602c21e1c40d8e0db74b0;p=thirdparty%2Fdovecot%2Fcore.git

MySQL reconnection memleak fix.

--HG--
branch : HEAD
---

diff --git a/src/auth/db-mysql.c b/src/auth/db-mysql.c
index 647455f3f2..70cbd1e3d9 100644
--- a/src/auth/db-mysql.c
+++ b/src/auth/db-mysql.c
@@ -97,21 +97,19 @@ static int mysql_conn_open(struct mysql_connection *conn)
 			i_error("MySQL: mysql_init failed");
 			return FALSE;
 		}
+	}
 
-		if (!mysql_real_connect(conn->mysql, conn->set.db_host,
-					conn->set.db_user, conn->set.db_passwd,
-					conn->set.db,
-					conn->set.db_port,
-					conn->set.db_unix_socket,
-					conn->set.db_client_flags)) {
-			i_error("MySQL: Can't connect to database %s: %s",
-				conn->set.db, mysql_error(conn->mysql));
-			conn->connected = FALSE;
-			conn->mysql = NULL;
-		} else {
-			conn->connected = TRUE;
-			i_info("MySQL: connected to %s", conn->set.db_host);
-		}
+	if (mysql_real_connect(conn->mysql, conn->set.db_host,
+			       conn->set.db_user, conn->set.db_passwd,
+			       conn->set.db,
+			       conn->set.db_port,
+			       conn->set.db_unix_socket,
+			       conn->set.db_client_flags) == NULL) {
+		i_error("MySQL: Can't connect to database %s: %s",
+			conn->set.db, mysql_error(conn->mysql));
+	} else {
+		conn->connected = TRUE;
+		i_info("MySQL: connected to %s", conn->set.db_host);
 	}
 	
 	return conn->connected;