From 250c9801197ea1c949bd94c1c891f81ab118b130 Mon Sep 17 00:00:00 2001 From: Jeremy Allison 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. (This used to be commit 82b8f749a36b42e22186297482aad2abb04fab8a) --- source3/wrepld/server.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'source3/wrepld') diff --git a/source3/wrepld/server.c b/source3/wrepld/server.c index f08674afbb..295eb15596 100644 --- a/source3/wrepld/server.c +++ b/source3/wrepld/server.c @@ -21,9 +21,6 @@ #include "includes.h" #include "wins_repl.h" -extern fstring global_myworkgroup; -extern pstring global_myname; - extern pstring user_socket_options; extern WINS_OWNER *global_wins_table; @@ -163,29 +160,9 @@ void exit_server(char *reason) } /**************************************************************************** - initialise connect, service and file structs + Usage of the program. ****************************************************************************/ -static void init_structs(void ) -{ - /* - * Set the machine NETBIOS name if not already - * set from the config file. - */ - - if (!*global_myname) { - char *p; - fstrcpy( global_myname, myhostname() ); - p = strchr_m( global_myname, '.' ); - if (p) - *p = 0; - } - strupper( global_myname ); -} - -/**************************************************************************** -usage on the program -****************************************************************************/ static void usage(char *pname) { @@ -684,7 +661,8 @@ static void process(void) if (!reload_services(False)) return(-1); - init_structs(); + if (!init_names()) + return -1; #ifdef WITH_PROFILE if (!profile_setup(False)) { @@ -693,8 +671,6 @@ static void process(void) } #endif - fstrcpy(global_myworkgroup, lp_workgroup()); - CatchSignal(SIGHUP,SIGNAL_CAST sig_hup); DEBUG(3,( "loaded services\n")); -- cgit