oops, util_pwdb.c appears to be included in PASSDB_OBJ not LIB_OBJ.
authorLuke Leighton <lkcl@samba.org>
Wed, 9 Dec 1998 16:30:37 +0000 (16:30 +0000)
committerLuke Leighton <lkcl@samba.org>
Wed, 9 Dec 1998 16:30:37 +0000 (16:30 +0000)
(This used to be commit ca10eb44909e66a07dc7f88b0a740390f9ec3922)

source3/include/proto.h
source3/lib/util.c
source3/lib/util_pwdb.c
source3/nmbd/nmbd.c

index e8d232645a14673f47247b64b7b1d3092173fd0a..918ef80f801398dcc95822d97b5465995816a7f6 100644 (file)
@@ -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  */
index e5ddda18916b096f344e15ed1956dce1833b7eea..066984962b88d0b811f1413f1e4eecce1f70cd12 100644 (file)
@@ -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
index 03ccdd475f2540c05a6cb2eeb51d474dfde7362a..a2e1ac010d258d2987bc2187dc58b45903b0c274 100644 (file)
@@ -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;
        }
index c266043c2cb4fd3d33004b0c69b54062f09aa4f1..1471254b4ea2b733bd35998fa2fb4a02d94eeeb9 100644 (file)
@@ -677,7 +677,7 @@ static void usage(char *pname)
 
   reload_services( True );
 
-       if (!pwdb_init_myworkgroup())
+       if (!init_myworkgroup())
        {
                exit(1);
        }