Author: obnox Date: 2007-06-20 10:08:31 +0000 (Wed, 20 Jun 2007) New Revision: 23553
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23553 Log: Also ignore "lock directory" in registry global options. Michael Modified: branches/SAMBA_3_0/source/param/loadparm.c branches/SAMBA_3_0_26/source/param/loadparm.c Changeset: Modified: branches/SAMBA_3_0/source/param/loadparm.c =================================================================== --- branches/SAMBA_3_0/source/param/loadparm.c 2007-06-20 08:47:13 UTC (rev 23552) +++ branches/SAMBA_3_0/source/param/loadparm.c 2007-06-20 10:08:31 UTC (rev 23553) @@ -3163,9 +3163,12 @@ &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", Modified: branches/SAMBA_3_0_26/source/param/loadparm.c =================================================================== --- branches/SAMBA_3_0_26/source/param/loadparm.c 2007-06-20 08:47:13 UTC (rev 23552) +++ branches/SAMBA_3_0_26/source/param/loadparm.c 2007-06-20 10:08:31 UTC (rev 23553) @@ -3164,9 +3164,12 @@ &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",
