summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/util.c14
-rw-r--r--source3/lib/util_pwdb.c17
2 files changed, 15 insertions, 16 deletions
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;
}