diff options
| author | Michael Adam <obnox@samba.org> | 2007-06-20 10:08:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:28 -0500 |
| commit | 3695a66166c6aa88051b21ad40a19f1cc8b87c7b (patch) | |
| tree | f56f1a3a3ae6a7aee359d0007894b6ffcaceaea7 /source/param | |
| parent | a4714b34284f9e205556166166f41ce9dad4d3da (diff) | |
| download | samba-3695a66166c6aa88051b21ad40a19f1cc8b87c7b.tar.gz samba-3695a66166c6aa88051b21ad40a19f1cc8b87c7b.tar.xz samba-3695a66166c6aa88051b21ad40a19f1cc8b87c7b.zip | |
r23553: Also ignore "lock directory" in registry global options.
Michael
Diffstat (limited to 'source/param')
| -rw-r--r-- | source/param/loadparm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c index 92d5f07e2a2..5255c95c27f 100644 --- a/source/param/loadparm.c +++ b/source/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", |