diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2003-03-24 11:25:34 +0000 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2003-03-24 11:25:34 +0000 |
commit | 11e9de855ca84af8d34a5f6459f304fcfa72dca3 (patch) | |
tree | 0eb5d0505a50136ed74a4207219c42b9d4996402 /source3/utils/testparm.c | |
parent | 223828642548c7e25f6189e274aa1edcdfe30c4f (diff) | |
download | samba-11e9de855ca84af8d34a5f6459f304fcfa72dca3.tar.gz samba-11e9de855ca84af8d34a5f6459f304fcfa72dca3.tar.bz2 samba-11e9de855ca84af8d34a5f6459f304fcfa72dca3.zip |
Patch from metze to generalise POPT_COMMON_SAMBA, with some minor changes
(This used to be commit 2ddfed298d7f0b6e690275725a39c3ef107077ae)
Diffstat (limited to 'source3/utils/testparm.c')
-rw-r--r-- | source3/utils/testparm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index 22964214be..c0e4f7606e 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -186,7 +186,7 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_ return ret; } -int main(int argc, const char *argv[]) + int main(int argc, const char *argv[]) { const char *config_file = dyn_CONFIGFILE; int s; @@ -206,7 +206,7 @@ int main(int argc, const char *argv[]) {"verbose", 'v', POPT_ARG_NONE, &show_defaults, 1, "Show default options too"}, {"server", 'L',POPT_ARG_STRING, &new_local_machine, 0, "Set %%L macro to servername\n"}, {"encoding", 't', POPT_ARG_STRING, &term_code, 0, "Print parameters with encoding"}, - {NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version}, + POPT_COMMON_SAMBA {0,0,0,0} }; |