diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2003-03-22 23:50:11 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2003-03-22 23:50:11 +0000 |
| commit | 89cd4674156ba5a62b8c9c4d943adc372ae576f7 (patch) | |
| tree | 5c495283a0bdd9f93107c8faf8a32be974fba618 | |
| parent | 94837e2125fec8e75dceee91c09581b7be48309b (diff) | |
| download | samba-89cd4674156ba5a62b8c9c4d943adc372ae576f7.tar.gz samba-89cd4674156ba5a62b8c9c4d943adc372ae576f7.tar.bz2 samba-89cd4674156ba5a62b8c9c4d943adc372ae576f7.zip | |
Add nicer --help headers
(This used to be commit e56ab71f1237a71c6ad4f321ce1db4e9397efd73)
| -rw-r--r-- | source3/nmbd/nmbd.c | 10 | ||||
| -rw-r--r-- | source3/smbd/server.c | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index fc08645f1d..a34593557e 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -3,7 +3,7 @@ NBT netbios routines and daemon - version 2 Copyright (C) Andrew Tridgell 1994-1998 Copyright (C) Jeremy Allison 1997-2002 - Copyright (C) Jelmer Vernooij 2002 (Conversion to popt) + Copyright (C) Jelmer Vernooij 2002,2003 (Conversion to popt) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -600,15 +600,14 @@ static BOOL open_sockets(BOOL isdaemon, int port) {"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, 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; global_nmb_port = NMB_PORT; @@ -624,7 +623,7 @@ static BOOL open_sockets(BOOL isdaemon, int 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 recieve them. */ + * these signals masked, we will have problems, as we won't receive them. */ BlockSignals(False, SIGHUP); BlockSignals(False, SIGUSR1); BlockSignals(False, SIGTERM); @@ -643,9 +642,6 @@ static BOOL open_sockets(BOOL isdaemon, int port) #endif pc = poptGetContext("nmbd", argc, argv, long_options, 0); - while((opt = poptGetNextOpt(pc)) != -1) - { } - poptFreeContext(pc); if ( opt_interactive ) { diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 96d936d3a8..627fad1572 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -669,11 +669,11 @@ static BOOL init_structs(void ) {"log-stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" }, {"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 {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_log_base}, - {NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version}, { NULL } }; |