summaryrefslogtreecommitdiff
path: root/source3/smbd/server.c
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd/server.c')
-rw-r--r--source3/smbd/server.c37
1 files changed, 19 insertions, 18 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index d0178508d9..3a32e1871f 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -651,15 +651,28 @@ static void usage(char *pname)
codepage_initialise(lp_client_code_page());
- fstrcpy(global_myworkgroup, lp_workgroup());
+ if (!pwdb_initialise())
+ {
+ exit(1);
+ }
- get_sam_domain_name();
+ if(!initialise_sam_password_db())
+ {
+ exit(1);
+ }
- generate_wellknown_sids();
+ if(!initialise_passgrp_db())
+ {
+ exit(1);
+ }
- if (!generate_sam_sid())
+ if(!initialise_group_db())
+ {
+ exit(1);
+ }
+
+ if(!initialise_alias_db())
{
- DEBUG(0,("ERROR: Samba cannot create a SAM SID.\n"));
exit(1);
}
@@ -700,7 +713,7 @@ static void usage(char *pname)
become_daemon();
}
- check_kernel_oplocks();
+ check_kernel_oplocks();
if (!directory_exist(lp_lockdir(), NULL)) {
mkdir(lp_lockdir(), 0755);
@@ -716,18 +729,6 @@ static void usage(char *pname)
if (!locking_init(0))
exit(1);
- if(!initialise_passgrp_db())
- exit(1);
-
- if(!initialise_password_db())
- exit(1);
-
- if(!initialise_group_db())
- exit(1);
-
- if(!initialise_alias_db())
- exit(1);
-
/* possibly reload the services file. */
reload_services(True);