diff options
| author | Michael Adam <obnox@samba.org> | 2007-07-07 21:33:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:51 -0500 |
| commit | f7b8a3782a7c28147f4e54c35b02a39d6b2bd879 (patch) | |
| tree | 3c78ece46254e7aa5f38ef8927933237863a7bd9 /source3 | |
| parent | ea78cb941acac7c76318464baba618fe79b2e196 (diff) | |
| download | samba-f7b8a3782a7c28147f4e54c35b02a39d6b2bd879.tar.gz samba-f7b8a3782a7c28147f4e54c35b02a39d6b2bd879.tar.bz2 samba-f7b8a3782a7c28147f4e54c35b02a39d6b2bd879.zip | |
r23745: Fix: Check whether top subkeyname instead of whole registry key name
is equal to GLOBAL_NAME.
Michael
(This used to be commit fdcdcacf0a9513829ad474605879ef55ce8b389e)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/utils/net_conf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index c65b57817b..6f23a00177 100644 --- 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; } |