fixed the popt option handling in nmbd, so that -i now works

(This used to be commit 2bb93421e665cdc0c4a2d8a539f76856e4d32249)

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index f87ab97798cb882256ef3c0e3e0dfe8b160490dd..8e7759d90b9616e95121027b58c809d5662a6f83 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -30,13 +30,13 @@ int global_nmb_port = -1;
 extern BOOL global_in_nmbd;
 
 /* are we running as a daemon ? */
-static BOOL is_daemon = False;
+static BOOL is_daemon;
 
 /* fork or run in foreground ? */
 static BOOL Fork = True;
 
 /* log to standard output ? */
-static BOOL log_stdout = False;
+static BOOL log_stdout;
 
 /* have we found LanMan clients yet? */
 BOOL found_lm_clients = False;
@@ -571,8 +571,10 @@ static BOOL open_sockets(BOOL isdaemon, int port)
  **************************************************************************** */
  int main(int argc, const char *argv[])
 {
-       static BOOL opt_interactive = False;
+       pstring logfile;
+       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)" },
@@ -584,46 +586,47 @@ static BOOL open_sockets(BOOL isdaemon, int port)
        POPT_COMMON_SAMBA
        { NULL }
        };
-       pstring logfile;
-
-  global_nmb_port = NMB_PORT;
-  global_in_nmbd = True;
-
-  StartupTime = time(NULL);
-
-  sys_srandom(time(NULL) ^ sys_getpid());
 
-  slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", dyn_LOGFILEBASE);
-  lp_set_logfile(logfile);
+       global_nmb_port = NMB_PORT;
 
-  fault_setup((void (*)(void *))fault_continue );
-
-  /* POSIX demands that signals are inherited. If the invoking process has
-   * these signals masked, we will have problems, as we won't receive them. */
-  BlockSignals(False, SIGHUP);
-  BlockSignals(False, SIGUSR1);
-  BlockSignals(False, SIGTERM);
-
-  CatchSignal( SIGHUP,  SIGNAL_CAST sig_hup );
-  CatchSignal( SIGTERM, SIGNAL_CAST sig_term );
+       pc = poptGetContext("nmbd", argc, argv, long_options, 0);
+       while ((opt = poptGetNextOpt(pc)) != -1) ;
+       poptFreeContext(pc);
 
+       global_in_nmbd = True;
+       
+       StartupTime = time(NULL);
+       
+       sys_srandom(time(NULL) ^ sys_getpid());
+       
+       slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", dyn_LOGFILEBASE);
+       lp_set_logfile(logfile);
+       
+       fault_setup((void (*)(void *))fault_continue );
+       
+       /* POSIX demands that signals are inherited. If the invoking process has
+        * these signals masked, we will have problems, as we won't receive them. */
+       BlockSignals(False, SIGHUP);
+       BlockSignals(False, SIGUSR1);
+       BlockSignals(False, SIGTERM);
+       
+       CatchSignal( SIGHUP,  SIGNAL_CAST sig_hup );
+       CatchSignal( SIGTERM, SIGNAL_CAST sig_term );
+       
 #if defined(SIGFPE)
-  /* we are never interested in SIGFPE */
-  BlockSignals(True,SIGFPE);
+       /* we are never interested in SIGFPE */
+       BlockSignals(True,SIGFPE);
 #endif
 
-  /* We no longer use USR2... */
+       /* We no longer use USR2... */
 #if defined(SIGUSR2)
-  BlockSignals(True, SIGUSR2);
+       BlockSignals(True, SIGUSR2);
 #endif
-  pc = poptGetContext("nmbd", argc, argv, long_options, 0);
-  
-  poptFreeContext(pc);
 
-  if ( opt_interactive ) {
-    Fork = False;
-    log_stdout = True;
-  }
+       if ( opt_interactive ) {
+               Fork = False;
+               log_stdout = True;
+       }
 
   if ( log_stdout && Fork ) {
     DEBUG(0,("ERROR: Can't log to stdout (-S) unless daemon is in foreground (-F) or interactive (-i)\n"));