From: Luke Leighton <lkcl@samba.org>
Date: Wed, 9 Dec 1998 16:30:37 +0000 (+0000)
Subject: oops, util_pwdb.c appears to be included in PASSDB_OBJ not LIB_OBJ.
X-Git-Tag: samba-4.0.0alpha6~801^2~20989
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=58a0cbc0c842187d68872fe021b2ce68a13a12eb

oops, util_pwdb.c appears to be included in PASSDB_OBJ not LIB_OBJ.
(This used to be commit ca10eb44909e66a07dc7f88b0a740390f9ec3922)
---

diff --git a/source3/include/proto.h b/source3/include/proto.h
index e8d232645a1..918ef80f801 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 e5ddda18916..066984962b8 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 03ccdd475f2..a2e1ac010d2 100644
--- a/source3/lib/util_pwdb.c
+++ b/source3/lib/util_pwdb.c
@@ -419,21 +419,6 @@ 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.
 **************************************************************/
@@ -441,7 +426,7 @@ 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 c266043c2cb..1471254b4ea 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);
 	}