diff options
| author | Luke Leighton <lkcl@samba.org> | 1998-12-09 16:23:57 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1998-12-09 16:23:57 +0000 |
| commit | 1f989cda944f21b3ba829e1008f1189d2d3671a8 (patch) | |
| tree | 6a2dae65450c1c0312722e5737155e090adf63c4 | |
| parent | cfba976fc234a4b9f1712d42dca405b25b314401 (diff) | |
| download | samba-1f989cda944f21b3ba829e1008f1189d2d3671a8.tar.gz samba-1f989cda944f21b3ba829e1008f1189d2d3671a8.tar.xz samba-1f989cda944f21b3ba829e1008f1189d2d3671a8.zip | |
need to initialise global_myworkgroup
(This used to be commit 501617307f3b9bbad76406d00b1bc82f5cb479a6)
| -rw-r--r-- | source3/lib/util_pwdb.c | 15 | ||||
| -rw-r--r-- | source3/nmbd/nmbd.c | 5 |
2 files changed, 19 insertions, 1 deletions
diff --git a/source3/lib/util_pwdb.c b/source3/lib/util_pwdb.c index 7e7eb0da8b..03ccdd475f 100644 --- a/source3/lib/util_pwdb.c +++ b/source3/lib/util_pwdb.c @@ -418,10 +418,11 @@ BOOL pwdb_gethexpwd(const char *p, char *pwd) return strhex_to_str(pwd, 32, p) == 16; } + /************************************************************* initialise password databases, domain names, domain sid. **************************************************************/ -BOOL pwdb_initialise(BOOL is_server) +BOOL pwdb_init_myworkgroup(void) { fstrcpy(global_myworkgroup, lp_workgroup()); @@ -430,9 +431,21 @@ BOOL pwdb_initialise(BOOL is_server) DEBUG(0,("ERROR: a workgroup name of * is no longer supported\n")); return False; } + return True; +} +/************************************************************* + initialise password databases, domain names, domain sid. +**************************************************************/ +BOOL pwdb_initialise(BOOL is_server) +{ get_sam_domain_name(); + if (!pwdb_init_myworkgroup()) + { + return False; + } + generate_wellknown_sids(); if (is_server) diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index d44fe5507c..c266043c2c 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -677,6 +677,11 @@ static void usage(char *pname) reload_services( True ); + if (!pwdb_init_myworkgroup()) + { + exit(1); + } + set_samba_nb_type(); if (!is_daemon && !is_a_socket(0)) |