diff options
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/lib/util.c | 14 | ||||
| -rw-r--r-- | source3/lib/util_pwdb.c | 17 | ||||
| -rw-r--r-- | source3/nmbd/nmbd.c | 2 |
4 files changed, 17 insertions, 18 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index e8d232645a..918ef80f80 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -373,6 +373,7 @@ BOOL user_in_list(char *user,char *list); /*The following definitions come from lib/util.c */ +BOOL init_myworkgroup(void); char *tmpdir(void); BOOL in_group(gid_t group, gid_t current_gid, int ngroups, gid_t *groups); uint32 get_number(const char *tmp); @@ -487,7 +488,6 @@ void pwdb_set_must_change_time(char *p, int max_len, time_t t); void pwdb_set_last_set_time(char *p, int max_len, time_t t); void pwdb_sethexpwd(char *p, const char *pwd, uint16 acct_ctrl); BOOL pwdb_gethexpwd(const char *p, char *pwd); -BOOL pwdb_init_myworkgroup(void); BOOL pwdb_initialise(BOOL is_server); /*The following definitions come from lib/util_sid.c */ diff --git a/source3/lib/util.c b/source3/lib/util.c index e5ddda1891..066984962b 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -86,6 +86,20 @@ char **my_netbios_names; static char *filename_dos(char *path,char *buf); +/************************************************************* + initialise password databases, domain names, domain sid. +**************************************************************/ +BOOL init_myworkgroup(void) +{ + fstrcpy(global_myworkgroup, lp_workgroup()); + + if (strequal(global_myworkgroup,"*")) + { + DEBUG(0,("ERROR: a workgroup name of * is no longer supported\n")); + return False; + } + return True; +} /**************************************************************************** find a suitable temporary directory. The result should be copied immediately diff --git a/source3/lib/util_pwdb.c b/source3/lib/util_pwdb.c index 03ccdd475f..a2e1ac010d 100644 --- a/source3/lib/util_pwdb.c +++ b/source3/lib/util_pwdb.c @@ -422,26 +422,11 @@ BOOL pwdb_gethexpwd(const char *p, char *pwd) /************************************************************* initialise password databases, domain names, domain sid. **************************************************************/ -BOOL pwdb_init_myworkgroup(void) -{ - fstrcpy(global_myworkgroup, lp_workgroup()); - - if (strequal(global_myworkgroup,"*")) - { - 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()) + if (!init_myworkgroup()) { return False; } diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index c266043c2c..1471254b4e 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -677,7 +677,7 @@ static void usage(char *pname) reload_services( True ); - if (!pwdb_init_myworkgroup()) + if (!init_myworkgroup()) { exit(1); } |