summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-04-14 02:38:21 +0000
committerTim Potter <tpot@samba.org>2003-04-14 02:38:21 +0000
commitbe67b58247680af0d672675f76e7b2af9dc94bcd (patch)
treeb79f4cb6edb7f27cb017691575d0dc6be9cc037e
parent5e1789d5d4d5048e3da2cda79c104cb6226de3a8 (diff)
downloadsamba-be67b58247680af0d672675f76e7b2af9dc94bcd.tar.gz
samba-be67b58247680af0d672675f76e7b2af9dc94bcd.tar.bz2
samba-be67b58247680af0d672675f76e7b2af9dc94bcd.zip
Syncup popt changes with HEAD.
(This used to be commit 39c987c3c522b66146e99fcc528cd60e05ad14f7)
-rw-r--r--source3/Makefile.in3
-rw-r--r--source3/nsswitch/wbinfo.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index a536020e99..ac27232590 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -594,8 +594,7 @@ WINBINDD_OBJ = \
$(PROFILE_OBJ) $(UNIGRP_OBJ) \
$(SECRETS_OBJ) $(LIBADS_OBJ) $(KRBCLIENT_OBJ)
-WBINFO_OBJ = nsswitch/wbinfo.o libsmb/smbencrypt.o libsmb/smbdes.o \
- $(POPT_LIB_OBJ)
+WBINFO_OBJ = nsswitch/wbinfo.o libsmb/smbencrypt.o libsmb/smbdes.o $(POPT_LIB_OBJ)
WINBIND_NSS_OBJ = nsswitch/wb_common.o @WINBIND_NSS_EXTRA_OBJS@
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index 16644cd484..61c54b3738 100644
--- a/source3/nsswitch/wbinfo.c
+++ b/source3/nsswitch/wbinfo.c
@@ -713,8 +713,8 @@ int main(int argc, char **argv)
{ "set-auth-user", 'A', POPT_ARG_STRING, &string_arg, OPT_SET_AUTH_USER, "Store user and password used by winbindd (root only)", "user%password" },
{ "get-auth-user", 0, POPT_ARG_NONE, NULL, OPT_GET_AUTH_USER, "Retrieve user and password used by winbindd (root only)", NULL },
{ "ping", 'p', POPT_ARG_NONE, 0, 'p', "Ping winbindd to see if it is alive" },
- { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
- { 0, 0, 0, 0 }
+ POPT_COMMON_VERSION
+ POPT_TABLEEND
};
/* Samba client initialisation */