From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 17 Sep 2015 16:50:02 +0000 (+0100)
Subject: Revert "if try to load a wrong client from SQL, don't start"
X-Git-Tag: release_3_0_10~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5afbe4de37fdac581678788d303bb98cad1dc7f6;p=thirdparty%2Ffreeradius-server.git

Revert "if try to load a wrong client from SQL, don't start"

This is wrong, we don't introduce behaviour changes that will break people's deployments in stable versions of the server
---

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index f9358ad52fd..e1e18c9c31c 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -272,7 +272,6 @@ static int generate_sql_clients(rlm_sql_t *inst)
 	rlm_sql_handle_t *handle;
 	rlm_sql_row_t row;
 	unsigned int i = 0;
-	int ret = 0;
 	RADCLIENT *c;
 
 	DEBUG("rlm_sql (%s): Processing generate_sql_clients",
@@ -341,8 +340,7 @@ static int generate_sql_clients(rlm_sql_t *inst)
 			WARN("Failed to add client, possible duplicate?");
 
 			client_free(c);
-			ret = -1;
-			break;
+			continue;
 		}
 
 		DEBUG("rlm_sql (%s): Client \"%s\" (%s) added", c->longname, c->shortname,
@@ -352,7 +350,7 @@ static int generate_sql_clients(rlm_sql_t *inst)
 	(inst->module->sql_finish_select_query)(handle, inst->config);
 	fr_connection_release(inst->pool, handle);
 
-	return ret;
+	return 0;
 }