summaryrefslogtreecommitdiff
path: root/nsswitch
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2016-11-14 16:38:29 +0100
committerJeremy Allison <jra@samba.org>2016-11-15 01:14:21 +0100
commit8f4e426f33fbbca0c363592c315fcb4ffd79fd67 (patch)
treeea51c63a4ecc0016b87f8d5d368411e2cdd6cab4 /nsswitch
parent15fa802c771513fa535f9c825bcbdcdcc73ae66a (diff)
downloadsamba-8f4e426f33fbbca0c363592c315fcb4ffd79fd67.tar.gz
wbinfo: Use ntlmv2 by default for wbinfo -a
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'nsswitch')
-rw-r--r--nsswitch/wbinfo.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index f7b5ace3f94..80b245a7f5c 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -2228,6 +2228,7 @@ enum {
OPT_CHANGE_USER_PASSWORD,
OPT_CCACHE_SAVE,
OPT_SID_TO_FULLNAME,
+ OPT_NTLMV1,
OPT_NTLMV2,
OPT_PAM_LOGON,
OPT_LOGOFF,
@@ -2249,7 +2250,7 @@ int main(int argc, const char **argv, char **envp)
int int_subarg = -1;
int result = 1;
bool verbose = false;
- bool use_ntlmv2 = false;
+ bool use_ntlmv2 = true;
bool use_lanman = false;
char *logoff_user = getenv("USER");
int logoff_uid = geteuid();
@@ -2343,6 +2344,8 @@ int main(int argc, const char **argv, char **envp)
{ "separator", 0, POPT_ARG_NONE, 0, OPT_SEPARATOR, "Get the active winbind separator", NULL },
{ "verbose", 0, POPT_ARG_NONE, 0, OPT_VERBOSE, "Print additional information per command", NULL },
{ "change-user-password", 0, POPT_ARG_STRING, &string_arg, OPT_CHANGE_USER_PASSWORD, "Change the password for a user", NULL },
+ { "ntlmv1", 0, POPT_ARG_NONE, 0, OPT_NTLMV1,
+ "Use NTLMv1 cryptography for user authentication", 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_VERSION
@@ -2371,8 +2374,8 @@ int main(int argc, const char **argv, char **envp)
case OPT_VERBOSE:
verbose = true;
break;
- case OPT_NTLMV2:
- use_ntlmv2 = true;
+ case OPT_NTLMV1:
+ use_ntlmv2 = false;
break;
case OPT_LANMAN:
use_lanman = true;