svn commit: samba r9396 - in branches/SAMBA_4_0/source/utils: .
abartlet at samba.org
abartlet at samba.org
Thu Aug 18 22:36:12 GMT 2005
Author: abartlet
Date: 2005-08-18 22:36:12 +0000 (Thu, 18 Aug 2005)
New Revision: 9396
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9396
Log:
ntlm_auth updates, including again support for the NTLMSSP client
mode, and specification of the workstation.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/utils/ntlm_auth.c
Changeset:
Modified: branches/SAMBA_4_0/source/utils/ntlm_auth.c
===================================================================
--- branches/SAMBA_4_0/source/utils/ntlm_auth.c 2005-08-18 20:36:13 UTC (rev 9395)
+++ branches/SAMBA_4_0/source/utils/ntlm_auth.c 2005-08-18 22:36:12 UTC (rev 9396)
@@ -349,7 +349,9 @@
cli_credentials_set_conf(creds);
if (opt_username) {
cli_credentials_set_username(creds, opt_username, CRED_SPECIFIED);
- }
+ } else {
+ cli_credentials_set_username(creds, "", CRED_GUESSED);
+ }
if (opt_domain) {
cli_credentials_set_domain(creds, opt_domain, CRED_SPECIFIED);
}
@@ -360,6 +362,9 @@
creds->password_cb = get_password;
creds->priv_data = (void*)mux_id;
}
+ if (opt_workstation) {
+ cli_credentials_set_workstation(creds, opt_workstation, CRED_SPECIFIED);
+ }
gensec_set_credentials(*gensec_state, creds);
@@ -498,7 +503,7 @@
}
} else if ((*gensec_state)->gensec_role == GENSEC_CLIENT) {
reply_code = "AF";
- reply_arg = NULL;
+ reply_arg = out_base64;
} else {
abort();
}
@@ -862,6 +867,7 @@
{ "password", 0, POPT_ARG_STRING, &opt_password, OPT_PASSWORD, "User's plaintext password"},
{ "multiplex", 0, POPT_ARG_NONE, &opt_multiplex, OPT_MULTIPLEX, "Multiplex Mode"},
POPT_COMMON_SAMBA
+ POPT_COMMON_VERSION
POPT_TABLEEND
};
More information about the samba-cvs
mailing list