Index: nmbd.c
===================================================================
RCS file: /cvsroot/samba/source/nmbd/nmbd.c,v
retrieving revision 1.161
diff -u -c -r1.161 nmbd.c
cvs server: conflicting specifications of output style
*** nmbd.c	11 Jan 2004 13:21:03 -0000	1.161
--- nmbd.c	11 Feb 2004 19:31:38 -0000
***************
*** 599,611 ****
  	static BOOL opt_interactive;
  	poptContext pc;
  	int opt;
  	struct poptOption long_options[] = {
  	POPT_AUTOHELP
  	{"daemon", 'D', POPT_ARG_VAL, &is_daemon, True, "Become a daemon(default)" },
  	{"interactive", 'i', POPT_ARG_VAL, &opt_interactive, True, "Run interactive (not a daemon)" },
  	{"foreground", 'F', POPT_ARG_VAL, &Fork, False, "Run daemon in foreground (for daemontools & etc)" },
  	{"log-stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" },
! 	{"hosts", 'H', POPT_ARG_STRING, dyn_LMHOSTSFILE, 'H', "Load a netbios hosts file"},
  	{"port", 'p', POPT_ARG_INT, &global_nmb_port, NMB_PORT, "Listen on the specified port" },
  	POPT_COMMON_SAMBA
  	{ NULL }
--- 599,612 ----
  	static BOOL opt_interactive;
  	poptContext pc;
  	int opt;
+ 	static char *p_lmhosts = dyn_LMHOSTSFILE;
  	struct poptOption long_options[] = {
  	POPT_AUTOHELP
  	{"daemon", 'D', POPT_ARG_VAL, &is_daemon, True, "Become a daemon(default)" },
  	{"interactive", 'i', POPT_ARG_VAL, &opt_interactive, True, "Run interactive (not a daemon)" },
  	{"foreground", 'F', POPT_ARG_VAL, &Fork, False, "Run daemon in foreground (for daemontools & etc)" },
  	{"log-stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" },
! 	{"hosts", 'H', POPT_ARG_STRING, &p_lmhosts, 'H', "Load a netbios hosts file"},
  	{"port", 'p', POPT_ARG_INT, &global_nmb_port, NMB_PORT, "Listen on the specified port" },
  	POPT_COMMON_SAMBA
  	{ NULL }
***************
*** 735,741 ****
  	}
  
  	/* Load in any static local names. */ 
! 	load_lmhosts_file(dyn_LMHOSTSFILE);
  	DEBUG(3,("Loaded hosts file %s\n", dyn_LMHOSTSFILE));
  
  	/* If we are acting as a WINS server, initialise data structures. */
--- 736,742 ----
  	}
  
  	/* Load in any static local names. */ 
! 	load_lmhosts_file(p_lmhosts);
  	DEBUG(3,("Loaded hosts file %s\n", dyn_LMHOSTSFILE));
  
  	/* If we are acting as a WINS server, initialise data structures. */