summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2010-08-10 12:28:46 +0200
committerSimo Sorce <idra@samba.org>2010-08-13 12:20:10 -0400
commit62a2a9e27f8983717f13dbe3d92b21ed4b9bf22e (patch)
tree5f2cda58478c21d328b793003d12a7a0da55acd6
parent9ab62b774f071be83375a4b2544a7e70e147e699 (diff)
downloadsamba-62a2a9e27f8983717f13dbe3d92b21ed4b9bf22e.tar.gz
samba-62a2a9e27f8983717f13dbe3d92b21ed4b9bf22e.tar.bz2
samba-62a2a9e27f8983717f13dbe3d92b21ed4b9bf22e.zip
s3-smbd: Regroup some init functions.
Signed-off-by: Simo Sorce <idra@samba.org>
-rw-r--r--source3/smbd/server.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index c41ad6fbaf..90756e1df2 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1084,33 +1084,33 @@ 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
+ /* 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
+ fds used. */
+ if (!share_info_db_init()) {
+ DEBUG(0,("ERROR: failed to load share info db.\n"));
+ exit(1);
+ }
+
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
- fds used. */
- if (!share_info_db_init()) {
- DEBUG(0,("ERROR: failed to load share info db.\n"));
- exit(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