r23745: Fix: Check whether top subkeyname instead of whole registry key name

is equal to GLOBAL_NAME.

Michael
(This used to be commit fdcdcacf0a9513829ad474605879ef55ce8b389e)

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index c65b57817bbca2a2e1639cc87a100849a1f0ece1..6f23a001776860f718cd00f5c7c044bf7c71079d 100644 (file)
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -184,11 +184,12 @@ static WERROR reg_setvalue_internal(struct registry_key *key,
                goto done;
        }
 
-       if (!strequal(key->key->name, GLOBAL_NAME) &&
+       if (!strequal(strrchr_m(key->key->name, '\\')+1, GLOBAL_NAME) &&
            lp_parameter_is_global(valname))
        {
                d_fprintf(stderr, "Global paramter '%s' not allowed in "
-                         "service definition.\n", valname);
+                         "service definition ('%s').\n", valname,
+                         strrchr_m(key->key->name, '\\')+1);
                werr = WERR_INVALID_PARAM;
                goto done;
        }