sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

r23641: Put check for forbidden values in smbconf into a function.

Browse Source 
(This will be used in a next step to prevent storing these
values in reg_smbconf.c.)

Michael
This commit is contained in:
Michael Adam 2007-06-28 10:32:52 +00:00 committed by Gerald (Jerry) Carter
parent 1b73bf79f4
commit 00be68a841
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/lib/util_reg.c
View File

@ -117,3 +117,25 @@ void normalize_dbkey(char *key)
string_sub(key, "\\", "/", len+1);
strupper_m(key);
}
/*
* check whether a given value name is forbidden in registry (smbconf)
*/
BOOL registry_smbconf_valname_forbidden(const char *valname)
{
/* hard code the list of forbidden names here for now */
const char *forbidden_valnames[] = {
"include",
"lock directory",
"lock dir",
NULL
};
const char **forbidden = NULL;
for (forbidden = forbidden_valnames; *forbidden != NULL; forbidden++) {
if (strwicmp(valname, *forbidden) == 0) {
return True;
}
}
return False;
}

5
source/param/loadparm.c
View File

@ -3165,10 +3165,7 @@ static BOOL process_registry_globals(BOOL (*pfunc)(const char *, const char *))
&type,
&size,
&data_p);
if ((strwicmp(valname,"include") == 0) ||
(strwicmp(valname, "lock directory") == 0) ||
(strwicmp(valname, "lock dir") == 0))
{
if (registry_smbconf_valname_forbidden(valname)) {
DEBUG(10, ("process_registry_globals: Ignoring "
"parameter '%s' in registry.\n", valname));
continue;