svn commit: samba r13393 - branches/SAMBA_3_0/source/lib branches/SAMBA_3_0/source/param branches/SAMBA_3_0/source/rpc_server branches/SAMBA_3_0/source/services trunk/source/lib trunk/source/param trunk/source/rpc_server trunk/source/services

[jerry at samba.org]

Author: jerry
Date: 2006-02-08 15:09:09 +0000 (Wed, 08 Feb 2006)
New Revision: 13393

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

Log:
Do not initialize the lp_svcctl_list() value since it is handled
internally in services_db.c now.  This prevents internal services from
being listed twice (one internal and one external) when no
'svcctl list' parameter is explcitly set in smb.conf


Modified:
   branches/SAMBA_3_0/source/lib/util_str.c
   branches/SAMBA_3_0/source/param/loadparm.c
   branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c
   branches/SAMBA_3_0/source/services/services_db.c
   trunk/source/lib/util_str.c
   trunk/source/param/loadparm.c
   trunk/source/rpc_server/srv_svcctl_nt.c
   trunk/source/services/services_db.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/util_str.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util_str.c	2006-02-08 14:18:05 UTC (rev 13392)
+++ branches/SAMBA_3_0/source/lib/util_str.c	2006-02-08 15:09:09 UTC (rev 13393)
@@ -1852,6 +1852,9 @@
 {
 	int i = 0;
 
+	if ( ! list )
+		return 0;
+
 	/* count the number of list members */
 	
 	for ( i=0; *list; i++, list++ );

Modified: branches/SAMBA_3_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0/source/param/loadparm.c	2006-02-08 14:18:05 UTC (rev 13392)
+++ branches/SAMBA_3_0/source/param/loadparm.c	2006-02-08 15:09:09 UTC (rev 13393)
@@ -1655,8 +1655,6 @@
 
 	Globals.bASUSupport       = True;
 	
-	Globals.szServicesList = str_list_make( "Spooler NETLOGON", NULL );
-
 	/* User defined shares. */
 	pstrcpy(s, dyn_LOCKDIR);
 	pstrcat(s, "/usershares");

Modified: branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c	2006-02-08 14:18:05 UTC (rev 13392)
+++ branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c	2006-02-08 15:09:09 UTC (rev 13393)
@@ -72,7 +72,7 @@
 
 	/* services listed in smb.conf get the rc.init interface */
 	
-	for ( i=0; service_list[i]; i++ ) {
+	for ( i=0; service_list && service_list[i]; i++ ) {
 		svcctl_ops[i].name = talloc_strdup( svcctl_ops, service_list[i] );
 		svcctl_ops[i].ops  = &rcinit_svc_ops;
 	}

Modified: branches/SAMBA_3_0/source/services/services_db.c
===================================================================
--- branches/SAMBA_3_0/source/services/services_db.c	2006-02-08 14:18:05 UTC (rev 13392)
+++ branches/SAMBA_3_0/source/services/services_db.c	2006-02-08 15:09:09 UTC (rev 13393)
@@ -436,7 +436,7 @@
 	for ( i=0; builtin_svcs[i].servicename; i++ )
 		add_new_svc_name( key, subkeys, builtin_svcs[i].servicename );
 		
-	for ( i=0; service_list[i]; i++ ) {
+	for ( i=0; service_list && service_list[i]; i++ ) {
 	
 		/* only add new services */
 		if ( regsubkey_ctr_key_exists( subkeys, service_list[i] ) )

Modified: trunk/source/lib/util_str.c
===================================================================
--- trunk/source/lib/util_str.c	2006-02-08 14:18:05 UTC (rev 13392)
+++ trunk/source/lib/util_str.c	2006-02-08 15:09:09 UTC (rev 13393)
@@ -1852,6 +1852,9 @@
 {
 	int i = 0;
 
+	if ( ! list )
+		return 0;
+
 	/* count the number of list members */
 	
 	for ( i=0; *list; i++, list++ );

Modified: trunk/source/param/loadparm.c
===================================================================
--- trunk/source/param/loadparm.c	2006-02-08 14:18:05 UTC (rev 13392)
+++ trunk/source/param/loadparm.c	2006-02-08 15:09:09 UTC (rev 13393)
@@ -1655,8 +1655,6 @@
 
 	Globals.bASUSupport       = True;
 	
-	Globals.szServicesList = str_list_make( "Spooler NETLOGON", NULL );
-
 	/* User defined shares. */
 	pstrcpy(s, dyn_LOCKDIR);
 	pstrcat(s, "/usershares");

Modified: trunk/source/rpc_server/srv_svcctl_nt.c
===================================================================
--- trunk/source/rpc_server/srv_svcctl_nt.c	2006-02-08 14:18:05 UTC (rev 13392)
+++ trunk/source/rpc_server/srv_svcctl_nt.c	2006-02-08 15:09:09 UTC (rev 13393)
@@ -72,7 +72,7 @@
 
 	/* services listed in smb.conf get the rc.init interface */
 	
-	for ( i=0; service_list[i]; i++ ) {
+	for ( i=0; service_list && service_list[i]; i++ ) {
 		svcctl_ops[i].name = talloc_strdup( svcctl_ops, service_list[i] );
 		svcctl_ops[i].ops  = &rcinit_svc_ops;
 	}

Modified: trunk/source/services/services_db.c
===================================================================
--- trunk/source/services/services_db.c	2006-02-08 14:18:05 UTC (rev 13392)
+++ trunk/source/services/services_db.c	2006-02-08 15:09:09 UTC (rev 13393)
@@ -436,7 +436,7 @@
 	for ( i=0; builtin_svcs[i].servicename; i++ )
 		add_new_svc_name( key, subkeys, builtin_svcs[i].servicename );
 		
-	for ( i=0; service_list[i]; i++ ) {
+	for ( i=0; service_list && service_list[i]; i++ ) {
 	
 		/* only add new services */
 		if ( regsubkey_ctr_key_exists( subkeys, service_list[i] ) )