loadparm: add userdata parameter to do_section() and do_parameter().

The userdata is currently unused. It can be used in the future for
passing a context like in samba4 code.

Michael
(cherry picked from commit 31b31171bd88c41443268d3300c492e2347b9e73)

2 files changed, 25 insertions, 21 deletions

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index f61d0d8fdc1..8b6e431270d 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -5327,8 +5327,9 @@ static int getservicebyname(const char *pszServiceName,
 static void copy_service(struct service *pserviceDest,
 			 struct service *pserviceSource,
 			 struct bitmap *pcopymapDest);
-static bool do_parameter(const char *pszParmName, const char *pszParmValue);
-static bool do_section(const char *pszSectionName);
+static bool do_parameter(const char *pszParmName, const char *pszParmValue,
+			 void *userdata);
+static bool do_section(const char *pszSectionName, void *userdata);
 static void init_copymap(struct service *pservice);
 static bool hash_a_service(const char *name, int number);
 static void free_service_byindex(int iService);
@@ -6485,7 +6486,7 @@ bool service_ok(int iService)
 /*
  * process_registry_globals
  */
-static bool process_registry_globals(bool (*pfunc)(const char *, const char *))
+static bool process_registry_globals(bool (*pfunc)(const char *, const char *, void *))
 {
 	WERROR werr;
 	char **param_names;
@@ -6517,13 +6518,13 @@ static bool process_registry_globals(bool (*pfunc)(const char *, const char *))
 	}
 
 	for (count = 0; count < num_params; count++) {
-		ret = pfunc(param_names[count], param_values[count]);
+		ret = pfunc(param_names[count], param_values[count], NULL);
 		if (ret != true) {
 			goto done;
 		}
 	}
 
-	ret = pfunc("registry shares", "yes");
+	ret = pfunc("registry shares", "yes", NULL);
 	/* store the csn */
 	smbconf_changed(conf_ctx, &conf_last_csn, NULL, NULL);
 
@@ -6731,7 +6732,7 @@ static bool handle_include(int snum, const char *pszParmValue, char **ptr)
 	string_set(ptr, fname);
 
 	if (file_exist(fname, NULL)) {
-		bool ret = pm_process(fname, do_section, do_parameter);
+		bool ret = pm_process(fname, do_section, do_parameter, NULL);
 		SAFE_FREE(fname);
 		return ret;
 	}
@@ -7162,7 +7163,8 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
  Process a parameter.
 ***************************************************************************/
 
-static bool do_parameter(const char *pszParmName, const char *pszParmValue)
+static bool do_parameter(const char *pszParmName, const char *pszParmValue,
+			 void *userdata)
 {
 	if (!bInGlobalSection && bGlobalOnly)
 		return (True);
@@ -7292,7 +7294,7 @@ void init_locals(void)
  Returns True on success, False on failure. 
 ***************************************************************************/
 
-static bool do_section(const char *pszSectionName)
+static bool do_section(const char *pszSectionName, void *userdata)
 {
 	bool bRetval;
 	bool isglobal = ((strwicmp(pszSectionName, GLOBAL_NAME) == 0) ||
@@ -8680,7 +8682,7 @@ bool lp_load(const char *pszFname,
 
 		/* We get sections first, so have to start 'behind' to make up */
 		iServiceIndex = -1;
-		bRetval = pm_process(n2, do_section, do_parameter);
+		bRetval = pm_process(n2, do_section, do_parameter, NULL);
 		SAFE_FREE(n2);
 
 		/* finish up the last section */
@@ -9073,7 +9075,7 @@ void lp_remove_service(int snum)
 
 void lp_copy_service(int snum, const char *new_name)
 {
-	do_section(new_name);
+	do_section(new_name, NULL);
 	if (snum >= 0) {
 		snum = lp_servicenumber(new_name);
 		if (snum >= 0)
diff --git a/source/param/params.c b/source/param/params.c
index e69715e4a34..478376c9e9a 100644
--- a/source/param/params.c
+++ b/source/param/params.c
@@ -230,7 +230,7 @@ static int Continuation(uint8_t *line, int pos )
  * ------------------------------------------------------------------------ **
  */
 
-static bool Section( DATA_BLOB *buf, myFILE *InFile, bool (*sfunc)(const char *) )
+static bool Section( DATA_BLOB *buf, myFILE *InFile, bool (*sfunc)(const char *, void *), void *userdata )
 {
 	int   c;
 	int   i;
@@ -299,7 +299,7 @@ static bool Section( DATA_BLOB *buf, myFILE *InFile, bool (*sfunc)(const char *)
 				DEBUG(0, ("%s Empty section name in configuration file.\n", func ));
 				return False;
 			}
-			if( !sfunc((char *)buf->data) )            /* Got a valid name.  Deal with it. */
+			if( !sfunc((char *)buf->data, userdata) )            /* Got a valid name.  Deal with it. */
 				return False;
 			EatComment( InFile );     /* Finish off the line.             */
 			return True;
@@ -336,7 +336,7 @@ static bool Section( DATA_BLOB *buf, myFILE *InFile, bool (*sfunc)(const char *)
  * ------------------------------------------------------------------------ **
  */
 
-static bool Parameter( DATA_BLOB *buf, myFILE *InFile, bool (*pfunc)(const char *, const char *), int c )
+static bool Parameter( DATA_BLOB *buf, myFILE *InFile, bool (*pfunc)(const char *, const char *, void *), int c, void *userdata )
 {
 	int   i       = 0;    /* Position within bufr. */
 	int   end     = 0;    /* bufr[end] is current end-of-string. */
@@ -441,7 +441,7 @@ static bool Parameter( DATA_BLOB *buf, myFILE *InFile, bool (*pfunc)(const char
 	}
 	buf->data[end] = '\0';          /* End of value. */
 
-	return( pfunc( (char *)buf->data, (char *)&buf->data[vstart] ) );   /* Pass name & value to pfunc().  */
+	return( pfunc( (char *)buf->data, (char *)&buf->data[vstart], userdata ) );   /* Pass name & value to pfunc().  */
 }
 
 /* ------------------------------------------------------------------------ **
@@ -467,8 +467,9 @@ static bool Parameter( DATA_BLOB *buf, myFILE *InFile, bool (*pfunc)(const char
  */
 
 static bool Parse( DATA_BLOB *buf, myFILE *InFile,
-                   bool (*sfunc)(const char *),
-                   bool (*pfunc)(const char *, const char *) )
+                   bool (*sfunc)(const char *, void *),
+                   bool (*pfunc)(const char *, const char *, void *),
+		   void *userdata)
 {
 	int    c;
 
@@ -485,7 +486,7 @@ static bool Parse( DATA_BLOB *buf, myFILE *InFile,
 				break;
 
 			case '[': /* Section Header. */
-				if( !Section( buf, InFile, sfunc ) )
+				if( !Section( buf, InFile, sfunc, userdata ) )
 					return False;
 				c = EatWhitespace( InFile );
 				break;
@@ -495,7 +496,7 @@ static bool Parse( DATA_BLOB *buf, myFILE *InFile,
 				break;
 
 			default: /* Parameter line. */
-				if( !Parameter( buf, InFile, pfunc, c ) )
+				if( !Parameter( buf, InFile, pfunc, c, userdata ) )
 					return False;
 				c = EatWhitespace( InFile );
 				break;
@@ -552,8 +553,9 @@ static myFILE *OpenConfFile( const char *FileName )
  */
 
 bool pm_process( const char *FileName,
-		bool (*sfunc)(const char *),
-		bool (*pfunc)(const char *, const char *) )
+		bool (*sfunc)(const char *, void *),
+		bool (*pfunc)(const char *, const char *, void *),
+		void *userdata)
 {
 	int   result;
 	myFILE *InFile;
@@ -574,7 +576,7 @@ bool pm_process( const char *FileName,
 		return False;
 	}
 
-	result = Parse( &buf, InFile, sfunc, pfunc );
+	result = Parse( &buf, InFile, sfunc, pfunc, userdata );
 	data_blob_free(&buf);
 
 	myfile_close(InFile);