sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-24 13:57:43 +03:00
Code

r13393: Do not initialize the lp_svcctl_list() value since it is handled

Browse Source 
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
(This used to be commit 6c4ede6cee7e1d25a6357e959972e8d390c27fe3)
This commit is contained in:
Gerald Carter 2006-02-08 15:09:09 +00:00 committed by Gerald (Jerry) Carter
parent 034877ca33
commit ef3f2c9675
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/lib/util_str.c
View File

@ -1852,6 +1852,9 @@ int str_list_count( const char **list )
{
int i = 0;
if ( ! list )
return 0;
/* count the number of list members */
for ( i=0; *list; i++, list++ );

2
source3/param/loadparm.c
View File

@ -1655,8 +1655,6 @@ static void init_globals(BOOL first_time_only)
Globals.bASUSupport = True;
Globals.szServicesList = str_list_make( "Spooler NETLOGON", NULL );
/* User defined shares. */
pstrcpy(s, dyn_LOCKDIR);
pstrcat(s, "/usershares");

2
source3/rpc_server/srv_svcctl_nt.c
View File

@ -72,7 +72,7 @@ BOOL init_service_op_table( void )
/* 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;
}

2
source3/services/services_db.c
View File

@ -436,7 +436,7 @@ void svcctl_init_keys( void )
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] ) )