From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 9 Dec 2010 11:10:17 +0000 (+0100)
Subject: Return error code, not success
X-Git-Tag: release_2_1_11~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f89a9eee32f19f7ffbe03d8365e4e5f3782358db;p=thirdparty%2Ffreeradius-server.git

Return error code, not success
---

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c
index 85e3e76042f..8891920d31a 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c
@@ -90,6 +90,17 @@ static int sql_init_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config)
 #ifdef CLIENT_MULTI_STATEMENTS
 	sql_flags |= CLIENT_MULTI_STATEMENTS;
 #endif
+
+ SET:
+CLIENT_REMEMBER_OPTIONS
+
+MYSQL_OPT_CONNECT_TIMEOUT (argument type: unsigned int *)
+mysql_options
+
+int mysql_options(MYSQL *mysql, enum mysql_option option, const void *arg)
+
+THEN call real_connect
+
 	if (!(mysql_sock->sock = mysql_real_connect(&(mysql_sock->conn),
 						    config->sql_server,
 						    config->sql_login,
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c
index 6cd4b9e6160..dbf3a4683c2 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c
@@ -146,6 +146,16 @@ static int sql_init_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
 	const char *port, *host;
 	rlm_sql_postgres_sock *pg_sock;
 
+#ifdef HAVE_OPENSSL_CRYPTO_H
+	static int ssl_init = 0;
+
+	if (!ssl_init) {
+		PQinitSSL(0);
+		ssl_init = 1;
+	}
+
+#endif
+
 	if (config->sql_server[0] != '\0') {
 		host = " host=";
 	} else {
diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 4d7f4e845e4..0163c56d0c2 100644
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -108,7 +108,7 @@ int sql_init_socketpool(SQL_INST * inst)
 			free(sqlsocket);
 			radlog(L_ERR, "rlm_sql: Failed to init lock: %s",
 			       strerror(errno));
-			return 0;
+			return -1;
 		}
 #endif