diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-09-06 12:28:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:45 -0500 |
| commit | 873749f2189ecf1fbfdc681df4dd304a17716279 (patch) | |
| tree | 3c130ca5c25631c0aed8c9888b33b42e2be28510 /source4/lib/cmdline | |
| parent | f057742ef3dd821170303d548f5fee8b6097805d (diff) | |
| download | samba-873749f2189ecf1fbfdc681df4dd304a17716279.tar.gz samba-873749f2189ecf1fbfdc681df4dd304a17716279.tar.bz2 samba-873749f2189ecf1fbfdc681df4dd304a17716279.zip | |
r18168: Use {NULL} rather than POPT_TABLEEND, which is not always available.
(This used to be commit 8b622c5ded0732df0eaf9f6226f52a27b6eacd73)
Diffstat (limited to 'source4/lib/cmdline')
| -rw-r--r-- | source4/lib/cmdline/popt_common.c | 6 | ||||
| -rw-r--r-- | source4/lib/cmdline/popt_common.h | 4 | ||||
| -rw-r--r-- | source4/lib/cmdline/popt_credentials.c | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c index 2d12e29b85..1457873399 100644 --- a/source4/lib/cmdline/popt_common.c +++ b/source4/lib/cmdline/popt_common.c @@ -151,7 +151,7 @@ struct poptOption popt_common_connection[] = { { "workgroup", 'W', POPT_ARG_STRING, NULL, 'W', "Set the workgroup name", "WORKGROUP" }, { "scope", 'i', POPT_ARG_STRING, NULL, 'i', "Use this Netbios scope", "SCOPE" }, { "maxprotocol", 'm', POPT_ARG_STRING, NULL, 'm', "Set max protocol level", "MAXPROTOCOL" }, - POPT_TABLEEND + { NULL } }; struct poptOption popt_common_samba[] = { @@ -163,12 +163,12 @@ struct poptOption popt_common_samba[] = { { "log-basename", 'l', POPT_ARG_STRING, NULL, 'l', "Basename for log/debug files", "LOGFILEBASE" }, { "leak-report", 0, POPT_ARG_NONE, NULL, OPT_LEAK_REPORT, "enable talloc leak reporting on exit", NULL }, { "leak-report-full",0, POPT_ARG_NONE, NULL, OPT_LEAK_REPORT_FULL, "enable full talloc leak reporting on exit", NULL }, - POPT_TABLEEND + { NULL } }; struct poptOption popt_common_version[] = { { NULL, 0, POPT_ARG_CALLBACK, popt_common_callback }, { "version", 'V', POPT_ARG_NONE, NULL, 'V', "Print version" }, - POPT_TABLEEND + { NULL } }; diff --git a/source4/lib/cmdline/popt_common.h b/source4/lib/cmdline/popt_common.h index a2eaebbbea..506bf1115c 100644 --- a/source4/lib/cmdline/popt_common.h +++ b/source4/lib/cmdline/popt_common.h @@ -29,10 +29,6 @@ extern struct poptOption popt_common_connection[]; extern struct poptOption popt_common_version[]; extern struct poptOption popt_common_credentials[]; -#ifndef POPT_TABLEEND -#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL } -#endif - #define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_samba, 0, "Common samba options:", NULL }, #define POPT_COMMON_CONNECTION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_connection, 0, "Connection options:", NULL }, #define POPT_COMMON_VERSION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version, 0, "Common samba options:", NULL }, diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c index 072ac418ae..5e9b6e97a5 100644 --- a/source4/lib/cmdline/popt_credentials.c +++ b/source4/lib/cmdline/popt_credentials.c @@ -145,5 +145,5 @@ struct poptOption popt_common_credentials[] = { { "simple-bind-dn", 0, POPT_ARG_STRING, NULL, OPT_SIMPLE_BIND_DN, "DN to use for a simple bind" }, { "kerberos", 'k', POPT_ARG_STRING, NULL, OPT_KERBEROS, "Use Kerberos" }, { "use-security-mechanisms", 0, POPT_ARG_STRING, NULL, OPT_GENSEC_MECHS, "Restricted list of authentication mechanisms available for use with this authentication"}, - POPT_TABLEEND + { NULL } }; |