From 66c321232a7ce39157fe91e6b5a0d21d9b5e25bf Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Mar 2003 14:32:11 +0000
Subject: Don't use old usage() function, but the one from popt. Remove some
 useless arguments (This used to be commit
 8df30059ef100a4d5e21501d7746427b4d312589)

---
 source3/nmbd/nmbd.c         |  1 -
 source3/nsswitch/winbindd.c |  1 -
 source3/smbd/server.c       |  1 -
 source3/wrepld/server.c     | 14 ++------------
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 184a86e2cf..d013b79d3e 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -601,7 +601,6 @@ static BOOL open_sockets(BOOL isdaemon, int port)
 	{"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
-	POPT_COMMON_CONNECTION
 	{ NULL }
 	};
 	pstring logfile;
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 0f34924e9d..cd72a4f572 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -820,7 +820,6 @@ int main(int argc, char **argv)
 		{ "dual-daemon", 'B', POPT_ARG_VAL, &opt_dual_daemon, True, "Dual daemon mode" },
 		{ "no-caching", 'n', POPT_ARG_VAL, &opt_nocache, False, "Disable caching" },
 		POPT_COMMON_SAMBA
-		POPT_COMMON_CONNECTION
 		POPT_TABLEEND
 	};
 	poptContext pc;
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index a166027acb..715e916263 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -670,7 +670,6 @@ static BOOL init_structs(void )
 	{"build-options", 'b', POPT_ARG_NONE, NULL, 'b', "Print build options" },
 	{"port", 'p', POPT_ARG_STRING, &ports, 0, "Listen on the specified ports"},
 	POPT_COMMON_SAMBA
-	POPT_COMMON_CONNECTION
 	{ NULL }
 	};
 
diff --git a/source3/wrepld/server.c b/source3/wrepld/server.c
index 196ea0d1d1..504818b8d5 100644
--- a/source3/wrepld/server.c
+++ b/source3/wrepld/server.c
@@ -159,15 +159,6 @@ void exit_server(const char *reason)
 	exit(0);
 }
 
-/****************************************************************************
- Usage of the program.
-****************************************************************************/
-
-static void usage(char *pname)
-{
-
-}
-
 /****************************************************************************
   Create an fd_set containing all the sockets in the subnet structures,
   plus the broadcast sockets.
@@ -516,7 +507,6 @@ static void process(void)
 		{ "interactive", 'i', POPT_ARG_NONE, NULL, 'i', "Run interactive (not a daemon)" },
 		{ "port", 'p', POPT_ARG_INT, &wins_port, 'p', "Listen on the specified port" },
 		POPT_COMMON_SAMBA
-		POPT_COMMON_CONNECTION
 		POPT_TABLEEND
 	};
 	int opt;
@@ -539,11 +529,10 @@ static void process(void)
 		}
 	}
 
-	poptFreeContext(pc);
 
 	if (log_stdout && Fork) {
 		d_printf("Can't log to stdout (-S) unless daemon is in foreground (-F) or interactive (-i)\n");
-		usage(argv[0]);
+		poptPrintUsage(pc, stderr, 0);
 		exit(1);
 	}
 
@@ -671,6 +660,7 @@ static void process(void)
 
 	process();
 
+	poptFreeContext(pc);
 	exit_server("normal exit");
 	return(0);
 }
-- 
cgit