sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-29 02:50:28 +03:00
Code

wbinfo: Use ntlmv2 by default for wbinfo -a

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2016-11-14 16:38:29 +01:00 committed by Jeremy Allison
parent 15fa802c77
commit 8f4e426f33
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs-xml/manpages/wbinfo.1.xml
View File

@ -49,6 +49,7 @@
<arg choice="opt">-m</arg>
<arg choice="opt">-n name</arg>
<arg choice="opt">-N netbios-name</arg>
<arg choice="opt">--ntlmv1</arg>
<arg choice="opt">--ntlmv2</arg>
<arg choice="opt">--online-status</arg>
<arg choice="opt">--own-domain</arg>
@ -329,9 +330,17 @@
</para></listitem>
</varlistentry>
<varlistentry>
<term>--ntlmv1</term>
<listitem><para>Use NTLMv1 cryptography for user authentication.
</para></listitem>
</varlistentry>
<varlistentry>
<term>--ntlmv2</term>
<listitem><para>Use NTLMv2 cryptography for user authentication.
<listitem><para>Use NTLMv2 cryptography for user
authentication. NTLMv2 is the default method, this
option is only maintained for compatibility.
</para></listitem>
</varlistentry>

9
nsswitch/wbinfo.c
View File

@ -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;