1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00

s3-smbd: Regroup some init functions.

Signed-off-by: Simo Sorce <idra@samba.org>
This commit is contained in:
Andreas Schneider 2010-08-10 12:28:46 +02:00 committed by Simo Sorce
parent 9ab62b774f
commit 62a2a9e27f

View File

@ -1084,24 +1084,14 @@ extern void build_options(bool screen);
if (!W_ERROR_IS_OK(registry_init_full()))
exit(1);
if (!print_backend_init(smbd_messaging_context()))
exit(1);
#if 0
if (!init_svcctl_db())
exit(1);
#endif
if (!init_system_info()) {
DEBUG(0,("ERROR: failed to setup system user info.\n"));
return -1;
}
if (!print_backend_init(smbd_messaging_context()))
exit(1);
if (!init_guest_info()) {
DEBUG(0,("ERROR: failed to setup guest info.\n"));
return -1;
}
/* Open the share_info.tdb here, so we don't have to open
after the fork on every single connection. This is a small
performance improvment and reduces the total number of system
@ -1111,6 +1101,16 @@ extern void build_options(bool screen);
exit(1);
}
if (!init_system_info()) {
DEBUG(0,("ERROR: failed to setup system user info.\n"));
return -1;
}
if (!init_guest_info()) {
DEBUG(0,("ERROR: failed to setup guest info.\n"));
return -1;
}
/* only start the background queue daemon if we are
running as a daemon -- bad things will happen if
smbd is launched via inetd and we fork a copy of