summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-06-20 10:08:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:28 -0500
commit04c75d9c95c5321d1fe5455671074b0e46f0df77 (patch)
tree69967ab8ca4de7f46a3d8a9575e5cfcd4daa520d /source3
parent9b11c3e08fabe8b93df4d17019eaf8cdd61566af (diff)
downloadsamba-04c75d9c95c5321d1fe5455671074b0e46f0df77.tar.gz
samba-04c75d9c95c5321d1fe5455671074b0e46f0df77.tar.bz2
samba-04c75d9c95c5321d1fe5455671074b0e46f0df77.zip
r23553: Also ignore "lock directory" in registry global options.
Michael (This used to be commit 3695a66166c6aa88051b21ad40a19f1cc8b87c7b)
Diffstat (limited to 'source3')
-rw-r--r--source3/param/loadparm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 92d5f07e2a..5255c95c27 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3163,9 +3163,12 @@ static BOOL process_registry_globals(BOOL (*pfunc)(const char *, const char *))
&type,
&size,
&data_p);
- if (strwicmp(valname,"include") == 0) {
+ if ((strwicmp(valname,"include") == 0) ||
+ (strwicmp(valname, "lock directory") == 0) ||
+ (strwicmp(valname, "lock dir") == 0))
+ {
DEBUG(10, ("process_registry_globals: Ignoring "
- "parameter 'include' in registry.\n"));
+ "parameter '%s' in registry.\n", valname));
continue;
}
DEBUG(10, ("process_registry_globals: got value '%s'\n",