diff options
author | Tim Potter <tpot@samba.org> | 2003-04-14 03:30:20 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2003-04-14 03:30:20 +0000 |
commit | 63cbbe26923b8f6bbed11428a3a218a88d17ffe7 (patch) | |
tree | 52dd470aabad3507df6bc9f68f5b90a6c2b86c12 /source3/web | |
parent | be67b58247680af0d672675f76e7b2af9dc94bcd (diff) | |
download | samba-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/web')
-rw-r--r-- | source3/web/swat.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/web/swat.c b/source3/web/swat.c index 6d14e9db98..fa319bb3ae 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -1267,9 +1267,8 @@ static void printers_page(void) struct poptOption long_options[] = { POPT_AUTOHELP { "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, True, "Disable authentication (demo mode)" }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version}, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile}, - { 0, 0, 0, 0 } + POPT_COMMON_SAMBA + POPT_TABLEEND }; fault_setup(NULL); |