From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 26 Nov 2016 20:25:58 +0000 (-0500)
Subject: Constify cs in fr_connection_pool_init
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50f01d8df79aaf04f50a41fc133303eaac72a39c;p=thirdparty%2Ffreeradius-server.git

Constify cs in fr_connection_pool_init

Even though it isn't... ugh
---

diff --git a/src/include/connection.h b/src/include/connection.h
index 578ff3ed0a6..2fd462d1ff9 100644
--- a/src/include/connection.h
+++ b/src/include/connection.h
@@ -125,7 +125,7 @@ typedef int (*fr_connection_alive_t)(void *opaque, void *connection);
  *	Pool allocation/initialisation
  */
 fr_connection_pool_t	*fr_connection_pool_init(TALLOC_CTX *ctx,
-						 CONF_SECTION *cs,
+						 CONF_SECTION const *cs,
 						 void *opaque,
 						 fr_connection_create_t c,
 						 fr_connection_alive_t a,
diff --git a/src/main/connection.c b/src/main/connection.c
index 38367ee38f1..64c858744f9 100644
--- a/src/main/connection.c
+++ b/src/main/connection.c
@@ -118,7 +118,7 @@ struct fr_connection_pool_t {
 	pthread_cond_t	done_reconnecting;	//!< Before calling the create callback, threads should
 						//!< block on this condition if reconnecting == true.
 
-	CONF_SECTION	*cs;			//!< Configuration section holding the section of parsed
+	CONF_SECTION const *cs;			//!< Configuration section holding the section of parsed
 						//!< config file that relates to this pool.
 	void		*opaque;		//!< Pointer to context data that will be passed to callbacks.
 
@@ -947,7 +947,7 @@ void fr_connection_pool_enable_triggers(fr_connection_pool_t *pool,
  *	- NULL on error.
  */
 fr_connection_pool_t *fr_connection_pool_init(TALLOC_CTX *ctx,
-					      CONF_SECTION *cs,
+					      CONF_SECTION const *cs,
 					      void *opaque,
 					      fr_connection_create_t c,
 					      fr_connection_alive_t a,
@@ -1040,7 +1040,13 @@ fr_connection_pool_t *fr_connection_pool_init(TALLOC_CTX *ctx,
 
 	DEBUG2("Initialising connection pool");
 
-	if (cf_section_parse(cs, pool, connection_config) < 0) goto error;
+	{
+		CONF_SECTION *mutable;
+
+		memcpy(&mutable, &cs, sizeof(mutable));
+
+		if (cf_section_parse(mutable, pool, connection_config) < 0) goto error;
+	}
 
 	/*
 	 *	Some simple limits