summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-04-14 03:30:20 +0000
committerTim Potter <tpot@samba.org>2003-04-14 03:30:20 +0000
commit63cbbe26923b8f6bbed11428a3a218a88d17ffe7 (patch)
tree52dd470aabad3507df6bc9f68f5b90a6c2b86c12 /source3/smbd
parentbe67b58247680af0d672675f76e7b2af9dc94bcd (diff)
downloadsamba-63cbbe26923b8f6bbed11428a3a218a88d17ffe7.tar.gz
samba-63cbbe26923b8f6bbed11428a3a218a88d17ffe7.tar.bz2
samba-63cbbe26923b8f6bbed11428a3a218a88d17ffe7.zip
Merge Jelmer's popt updates from HEAD.
(This used to be commit 98e84b3e83d2a365c818ea64f9418edb29d690f2)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/server.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 056231c344..70925254e4 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -3,7 +3,7 @@
Main SMB server routines
Copyright (C) Andrew Tridgell 1992-1998
Copyright (C) Martin Pool 2002
- Copyright (C) Jelmer Vernooij 2002
+ Copyright (C) Jelmer Vernooij 2002-2003
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
@@ -669,11 +669,7 @@ 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"},
- {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},
+ POPT_COMMON_SAMBA
{ NULL }
};