r12967: BUG 1061: don't corrupt the file name when reading an lmhosts file (-H) in...

(This used to be commit 14160c496112e06e4ea0d0a5aa5bad2b58e90601)

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 68004bad599a369abffadc0efea2aa9cf80822df..ea7e9a5288f9b2e0baffd0f94b156b3c4bf51c37 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -657,13 +657,14 @@ static BOOL open_sockets(BOOL isdaemon, int port)
        pstring logfile;
        static BOOL opt_interactive;
        poptContext pc;
+       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, dyn_LMHOSTSFILE, 'H', "Load a netbios hosts file"},
+       {"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 }
@@ -803,8 +804,8 @@ static BOOL open_sockets(BOOL isdaemon, int port)
        }
 
        /* Load in any static local names. */ 
-       load_lmhosts_file(dyn_LMHOSTSFILE);
-       DEBUG(3,("Loaded hosts file %s\n", dyn_LMHOSTSFILE));
+       load_lmhosts_file(p_lmhosts);
+       DEBUG(3,("Loaded hosts file %s\n", p_lmhosts));
 
        /* If we are acting as a WINS server, initialise data structures. */
        if( !initialise_wins() ) {