r23657: Prevent setting of a global option in a share definition

in "net conf setparm".

Michael

1 files changed, 18 insertions, 0 deletions

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 58ea751fa58..8c6c0f1afec 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -2789,6 +2789,24 @@ BOOL lp_parameter_valid(const char *pszParmName)
 }
 
 /***************************************************************************
+ Check whether the given name is the name of a global parameter.
+ Returns True for strings belonging to parameters of class
+ P_GLOBAL, False for all other strings, also for parametric options
+ and strings not belonging to any option.
+***************************************************************************/
+
+BOOL lp_parameter_is_global(const char *pszParmName)
+{
+	int num = map_parameter(pszParmName);
+
+	if (num >= 0) {
+		return (parm_table[num].p_class == P_GLOBAL);
+	}
+
+	return False;
+}
+
+/***************************************************************************
  Map a parameter's string representation to something we can use. 
  Returns False if the parameter string is not recognised, else TRUE.
 ***************************************************************************/