Allow for functions map_parameter_canonical() and is_synonym_of() to

be called with inverse == NULL.

Add a new function lp_parameter_is_canonical() to check whether a
parameter name is the canonical name (as apposed to an alias).

Michael

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_2@24572 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index bd318791b5b081a8956c605f26fe45d213c876fa..e65a649584689a041ea5d1bca11dad24c279e552 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -2817,6 +2817,22 @@ BOOL lp_parameter_is_global(const char *pszParmName)
        return False;
 }
 
+/**************************************************************************
+ Check whether the given name is the canonical name of a parameter.
+ Returns False if it is not a valid parameter Name.
+ For parametric options, True is returned.
+**************************************************************************/
+
+BOOL lp_parameter_is_canonical(const char *parm_name)
+{
+       if (!lp_parameter_is_valid(parm_name)) {
+               return False;
+       }
+
+       return (map_parameter(parm_name) ==
+               map_parameter_canonical(parm_name, NULL));
+}
+
 /**************************************************************************
  Determine the canonical name for a parameter.
  Indicate when it is an inverse (boolean) synonym instead of a
@@ -2924,21 +2940,25 @@ static int map_parameter(const char *pszParmName)
 static int map_parameter_canonical(const char *pszParmName, BOOL *inverse)
 {
        int parm_num, canon_num;
-
-       *inverse = False;
+       BOOL loc_inverse = False;
 
        parm_num = map_parameter(pszParmName);
        if ((parm_num < 0) || !(parm_table[parm_num].flags & FLAG_HIDE)) {
                /* invalid, parametric or no canidate for synonyms ... */
-               return parm_num;
+               goto done;
        }
 
        for (canon_num = 0; parm_table[canon_num].label; canon_num++) {
-               if (is_synonym_of(parm_num, canon_num, inverse)) {
-                       return canon_num;
+               if (is_synonym_of(parm_num, canon_num, &loc_inverse)) {
+                       parm_num = canon_num;
+                       goto done;
                }
        }
 
+done:
+       if (inverse != NULL) {
+               *inverse = loc_inverse;
+       }
        return parm_num;
 }
 
@@ -2955,12 +2975,14 @@ static BOOL is_synonym_of(int parm1, int parm2, BOOL *inverse)
            (parm_table[parm1].flags & FLAG_HIDE) &&
            !(parm_table[parm2].flags & FLAG_HIDE))
        {
-               if ((parm_table[parm1].type == P_BOOLREV) &&
-                   (parm_table[parm2].type == P_BOOL))
-               {
-                       *inverse = True;
-               } else {
-                       *inverse = False;
+               if (inverse != NULL) {
+                       if ((parm_table[parm1].type == P_BOOLREV) &&
+                           (parm_table[parm2].type == P_BOOL))
+                       {
+                               *inverse = True;
+                       } else {
+                               *inverse = False;
+                       }
                }
                return True;
        }