diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-08-18 22:36:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:33:33 -0500 |
| commit | bfe1ea62446594885a027d13fc9caa29b17793ad (patch) | |
| tree | 198cd02bf37045b330c5d8c5892a4ed9d5d4da86 /source4 | |
| parent | f2ac4b8d6b24bec9aecfe00daf8c0b4ccf3964a6 (diff) | |
| download | samba-bfe1ea62446594885a027d13fc9caa29b17793ad.tar.gz samba-bfe1ea62446594885a027d13fc9caa29b17793ad.tar.bz2 samba-bfe1ea62446594885a027d13fc9caa29b17793ad.zip | |
r9396: ntlm_auth updates, including again support for the NTLMSSP client
mode, and specification of the workstation.
Andrew Bartlett
(This used to be commit 8f53d995c63b718b40fb52ec102fa74f94719b65)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/utils/ntlm_auth.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c index 35520756e7..7e1ca011e4 100644 --- a/source4/utils/ntlm_auth.c +++ b/source4/utils/ntlm_auth.c @@ -349,7 +349,9 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode, 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 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode, 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 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode, } } else if ((*gensec_state)->gensec_role == GENSEC_CLIENT) { reply_code = "AF"; - reply_arg = NULL; + reply_arg = out_base64; } else { abort(); } @@ -862,6 +867,7 @@ enum { { "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 }; |