r23553: Also ignore "lock directory" in registry global options.
authorMichael Adam <obnox@samba.org>
Wed, 20 Jun 2007 10:08:31 +0000 (10:08 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:23:28 +0000 (12:23 -0500)
Michael

source/param/loadparm.c

index 92d5f07e2a24b312c50a94caaf691ba092bc6fda..5255c95c27f3e7ecb513b315cb70bd56fb8c80a8 100644 (file)
@@ -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",