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/utils | |
| 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/utils')
| -rw-r--r-- | source4/utils/ndrdump.c | 2 | ||||
| -rw-r--r-- | source4/utils/net/net.c | 2 | ||||
| -rw-r--r-- | source4/utils/ntlm_auth.c | 2 | ||||
| -rw-r--r-- | source4/utils/testparm.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source4/utils/ndrdump.c b/source4/utils/ndrdump.c index 86a32e9d5b..0261a1c6df 100644 --- a/source4/utils/ndrdump.c +++ b/source4/utils/ndrdump.c @@ -153,7 +153,7 @@ const struct dcerpc_interface_table *load_iface_from_plugin(const char *plugin, {"load-dso", 'l', POPT_ARG_STRING, &plugin, 0, "load from shared object file", NULL }, POPT_COMMON_SAMBA POPT_AUTOHELP - POPT_TABLEEND + { NULL } }; dcerpc_table_init(); diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c index f2223a03a3..70c1de922d 100644 --- a/source4/utils/net/net.c +++ b/source4/utils/net/net.c @@ -148,7 +148,7 @@ static int binary_net(int argc, const char **argv) POPT_COMMON_CONNECTION POPT_COMMON_CREDENTIALS POPT_COMMON_VERSION - POPT_TABLEEND + { NULL } }; #ifdef HAVE_SETBUFFER diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c index 1b25c96ab2..1961daeb10 100644 --- a/source4/utils/ntlm_auth.c +++ b/source4/utils/ntlm_auth.c @@ -1005,7 +1005,7 @@ int main(int argc, const char **argv) { "multiplex", 0, POPT_ARG_NONE, &opt_multiplex, OPT_MULTIPLEX, "Multiplex Mode"}, POPT_COMMON_SAMBA POPT_COMMON_VERSION - POPT_TABLEEND + { NULL } }; /* Samba client initialisation */ diff --git a/source4/utils/testparm.c b/source4/utils/testparm.c index fece3466ff..456baee301 100644 --- a/source4/utils/testparm.c +++ b/source4/utils/testparm.c @@ -106,7 +106,7 @@ static int do_global_checks(void) {"client-ip", '\0', POPT_ARG_STRING, &caddr, 0, "Client IP address for 'hosts allow' checking"}, POPT_COMMON_SAMBA POPT_COMMON_VERSION - POPT_TABLEEND + { NULL } }; setup_logging(NULL, DEBUG_STDERR); |