From 04c75d9c95c5321d1fe5455671074b0e46f0df77 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 20 Jun 2007 10:08:31 +0000 Subject: r23553: Also ignore "lock directory" in registry global options. Michael (This used to be commit 3695a66166c6aa88051b21ad40a19f1cc8b87c7b) --- source3/param/loadparm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source3/param/loadparm.c') 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", -- cgit