Removed global_myworkgroup, global_myname, global_myscope. Added liberal

[jpeach/samba.git] / source / nsswitch / winbindd.c

diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c
index 2bd6d7967c226c4222c55b10ccbd1cb4660be3fa..8ec8bdced6fcbaf9383a69d7303a162aed9d120b 100644 (file)
--- a/source/nsswitch/winbindd.c
+++ b/source/nsswitch/winbindd.c
@@ -744,8 +744,6 @@ static void usage(void)
  int main(int argc, char **argv)
 {
        extern BOOL AllowDebugChange;
-       extern pstring global_myname;
-       extern fstring global_myworkgroup;
        pstring logfile;
        BOOL interactive = False;
        int opt;
@@ -826,16 +824,8 @@ static void usage(void)
 
        /* Setup names. */
 
-       if (!*global_myname) {
-               char *p;
-
-               fstrcpy(global_myname, myhostname());
-               p = strchr(global_myname, '.');
-               if (p)
-                       *p = 0;
-       }
-
-        fstrcpy(global_myworkgroup, lp_workgroup());
+       if (!init_names())
+               exit(1);
 
        if (!interactive) {
                become_daemon();