svn commit: samba r23547 - in branches: SAMBA_3_0/source/param SAMBA_3_0_26/source/param

[obnox at samba.org]

Author: obnox
Date: 2007-06-19 21:06:31 +0000 (Tue, 19 Jun 2007)
New Revision: 23547

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23547

Log:
Ignore parameter "include" in regsitry globals.

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-19 16:59:51 UTC (rev 23546)
+++ branches/SAMBA_3_0/source/param/loadparm.c	2007-06-19 21:06:31 UTC (rev 23547)
@@ -3163,6 +3163,11 @@
 				  &type,
 				  &size,
 				  &data_p);
+		if (strcmp(valname,"include")) {
+			DEBUG(10, ("process_registry_globals: Ignoring "
+				   "parameter 'include' in registry.\n"));
+			continue;
+		}
 		DEBUG(10, ("process_registry_shares: got value '%s'\n",
 			   valname));
 		if (size && data_p) {

Modified: branches/SAMBA_3_0_26/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0_26/source/param/loadparm.c	2007-06-19 16:59:51 UTC (rev 23546)
+++ branches/SAMBA_3_0_26/source/param/loadparm.c	2007-06-19 21:06:31 UTC (rev 23547)
@@ -3164,6 +3164,11 @@
 				  &type,
 				  &size,
 				  &data_p);
+		if (strcmp(valname,"include")) {
+			DEBUG(10, ("process_registry_globals: Ignoring "
+				   "parameter 'include' in registry.\n"));
+			continue;
+		}
 		DEBUG(10, ("process_registry_shares: got value '%s'\n",
 			   valname));
 		if (size && data_p) {