summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2009-08-12 17:25:46 +0200
committerKai Blin <kai@samba.org>2009-08-18 19:53:40 +0200
commitab818cdf8b78fd727c5b704dad65d524bc902b63 (patch)
tree20696de12da13e4e2c1c87a5c5fd6ce7d959a9c1
parent6d4fd3e0a285cc0f0fe46dd2c96a1ac36bc84f3f (diff)
downloadsamba-ab818cdf8b78fd727c5b704dad65d524bc902b63.tar.gz
samba-ab818cdf8b78fd727c5b704dad65d524bc902b63.tar.bz2
samba-ab818cdf8b78fd727c5b704dad65d524bc902b63.zip
s3 wbinfo: Explicitly include popt header, remove unused common options.
-rw-r--r--nsswitch/wbinfo.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 93de091679..70742c9283 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -23,7 +23,12 @@
#include "includes.h"
#include "winbind_client.h"
#include "libwbclient/wbclient.h"
+#include "lib/popt/popt.h"
#include "../libcli/auth/libcli_auth.h"
+#if !(_SAMBA_VERSION_) < 4
+#include "lib/cmdline/popt_common.h"
+#endif
+
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
@@ -1751,7 +1756,6 @@ int main(int argc, char **argv, char **envp)
{ "change-user-password", 0, POPT_ARG_STRING, &string_arg, OPT_CHANGE_USER_PASSWORD, "Change the password for a user", NULL },
{ "ntlmv2", 0, POPT_ARG_NONE, 0, OPT_NTLMV2, "Use NTLMv2 cryptography for user authentication", NULL},
{ "lanman", 0, POPT_ARG_NONE, 0, OPT_LANMAN, "Use lanman cryptography for user authentication", NULL},
- POPT_COMMON_CONFIGFILE
POPT_COMMON_VERSION
POPT_TABLEEND
};