From 82b8f749a36b42e22186297482aad2abb04fab8a Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 12 Nov 2002 23:15:52 +0000
Subject: Removed global_myworkgroup, global_myname, global_myscope. Added
 liberal dashes of const. This is a rather large check-in, some things may
 break. It does compile though :-). Jeremy.

---
 source/nsswitch/winbindd.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'source/nsswitch/winbindd.c')

diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c
index 2bd6d7967c2..8ec8bdced6f 100644
--- 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();
-- 
cgit