From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 15 Jul 2016 13:25:31 +0000 (-0400)
Subject: Fix merge issue
X-Git-Tag: release_3_0_12~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e39ca21d6edd8c0e847e62a17ccd73c9908c2c7;p=thirdparty%2Ffreeradius-server.git

Fix merge issue
---

diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c
index 48d8ada8fb5..40245bc9974 100644
--- a/src/modules/rlm_sqlippool/rlm_sqlippool.c
+++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c
@@ -317,7 +317,7 @@ static int sqlippool_command(char const *fmt, rlm_sql_handle_t **handle,
 	}
 	talloc_free(expanded);
 
-	if (*handle) (data->sql_inst->module->sql_finish_query)(handle, data->sql_inst->config);
+	if (*handle) (data->sql_inst->module->sql_finish_query)(*handle, data->sql_inst->config);
 
 	return 0;
 }