diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-03 15:30:15 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-03 15:30:15 +1000 |
| commit | 6c4cdbe8916ad4782058847358404bc005c5d908 (patch) | |
| tree | be30919247d4bf75e605c6825804b6aa241f3fd8 | |
| parent | c0b9a128d140cd911dee2533b5eb453251e2db57 (diff) | |
| download | samba-6c4cdbe8916ad4782058847358404bc005c5d908.tar.gz samba-6c4cdbe8916ad4782058847358404bc005c5d908.tar.bz2 samba-6c4cdbe8916ad4782058847358404bc005c5d908.zip | |
s3-libnetapi: Cope with popt versions without POPT_TABLEEND
| -rw-r--r-- | source3/lib/netapi/examples/common.h | 4 | ||||
| -rw-r--r-- | source3/lib/netapi/tests/common.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/source3/lib/netapi/examples/common.h b/source3/lib/netapi/examples/common.h index 85df51d868..917698c956 100644 --- a/source3/lib/netapi/examples/common.h +++ b/source3/lib/netapi/examples/common.h @@ -7,5 +7,9 @@ void popt_common_callback(poptContext con, extern struct poptOption popt_common_netapi_examples[]; +#ifndef POPT_TABLEEND +#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL } +#endif + #define POPT_COMMON_LIBNETAPI_EXAMPLES { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_netapi_examples, 0, "Common samba netapi example options:", NULL }, diff --git a/source3/lib/netapi/tests/common.h b/source3/lib/netapi/tests/common.h index 7e05aaf657..fcbdad14b7 100644 --- a/source3/lib/netapi/tests/common.h +++ b/source3/lib/netapi/tests/common.h @@ -28,6 +28,10 @@ extern struct poptOption popt_common_netapi_examples[]; #define POPT_COMMON_LIBNETAPI_EXAMPLES { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_netapi_examples, 0, "Common samba netapi example options:", NULL }, +#ifndef POPT_TABLEEND +#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL } +#endif + NET_API_STATUS test_netuseradd(const char *hostname, const char *username); |