From 7da7b4a464758a53dd6b1b8a55d3e26bc8f5e402 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 4 Nov 2002 14:08:11 +0000
Subject: Make IRIX happy (This used to be commit
 aeb94bb0d7ad84b52a5f729a3e83f4fb00005771)

---
 source3/nmbd/nmbd.c   | 31 +++++++++++++++----------------
 source3/smbd/server.c |  6 +++---
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 29caa64abc..9f4a934fae 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -661,28 +661,27 @@ static BOOL init_structs(void)
  **************************************************************************** */
  int main(int argc, const char *argv[])
 {
-
-  extern BOOL append_log;
-  BOOL opt_interactive = False;
-  poptContext pc;
-   struct poptOption long_options[] = {
- 	  POPT_AUTOHELP
- 	{"daemon", 'D', POPT_ARG_VAL, &is_daemon, True, "Become a daemon(default)" },
- 	{"log-append", 'a', POPT_ARG_VAL, &append_log, True, "Append to log file" },
- 	{"interactive", 'i', POPT_ARG_VAL, &opt_interactive, True, "Run interactive (not a daemon)" },
- 	{"log-overwrite", 'o', POPT_ARG_VAL, &append_log, False, "Overwrite log file, don't append" },
- 	{"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" },
+	extern BOOL append_log;
+	static BOOL opt_interactive = False;
+	poptContext pc;
+	struct poptOption long_options[] = {
+	POPT_AUTOHELP
+	{"daemon", 'D', POPT_ARG_VAL, &is_daemon, True, "Become a daemon(default)" },
+	{"log-append", 'a', POPT_ARG_VAL, &append_log, True, "Append to log file" },
+	{"interactive", 'i', POPT_ARG_VAL, &opt_interactive, True, "Run interactive (not a daemon)" },
+	{"log-overwrite", 'o', POPT_ARG_VAL, &append_log, False, "Overwrite log file, don't append" },
+	{"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" },
 	{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
 	{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile },
 	{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_socket_options },
 	{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version },
 	{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_netbios_name },
 	{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_log_base },
- 	{ NULL }
-  };
-  int opt;
-  pstring logfile;
+	{ NULL }
+	};
+	int opt;
+	pstring logfile;
 
   append_log = True;  /* Default, override with '-o' option. */
 
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index de453fb12b..b17ca7ba2c 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -619,9 +619,9 @@ static void init_structs(void )
  int main(int argc,const char *argv[])
 {
 	/* shall I run as a daemon */
-	BOOL is_daemon = False;
-	BOOL interactive = False;
-	char *ports = NULL;
+	static BOOL is_daemon = False;
+	static BOOL interactive = False;
+	static char *ports = NULL;
 	int opt;
 	poptContext pc;
 
-- 
cgit