diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-04-13 20:57:26 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-04-13 20:57:26 +0000 |
| commit | 37f62744455f8e39e1c2d11de072fb64bea89c93 (patch) | |
| tree | 7e0bc798d2dbf73940c0075fd4dca6004184021b | |
| parent | 5070a8d12d0cef2a3e589e032f78217debef795a (diff) | |
| download | samba-37f62744455f8e39e1c2d11de072fb64bea89c93.tar.gz | |
r201: Fix bugs in the --helper-protocol=ntlm-server-1 implementation.
(allow the use of base64 encoded strings, LM or NT passwords)
Andrew Bartlett
| -rw-r--r-- | source/utils/ntlm_auth.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/utils/ntlm_auth.c b/source/utils/ntlm_auth.c index 0e763968abf..70383b31dc9 100644 --- a/source/utils/ntlm_auth.c +++ b/source/utils/ntlm_auth.c @@ -1418,7 +1418,7 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod } else { x_fprintf(x_stdout, "Authenticated: No\n"); } - } else if (!lm_response.data || !nt_response.data) { + } else if (!lm_response.data && !nt_response.data) { x_fprintf(x_stdout, "Error: No password supplied!\n"); } else if (!challenge.data) { x_fprintf(x_stdout, "Error: No lanman-challenge supplied!\n"); @@ -1513,30 +1513,31 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod request = buf; - parameter = strstr_m(request, ": "); + /* Indicates a base64 encoded structure */ + parameter = strstr_m(request, ":: "); if (!parameter) { - /* Indicates a base64 encoded structure */ - parameter = strstr_m(request, ":: "); + parameter = strstr_m(request, ": "); if (!parameter) { DEBUG(0, ("Parameter not found!\n")); x_fprintf(x_stdout, "Error: Parameter not found!\n.\n"); return; } - parameter[0] ='\0'; - parameter++; + parameter[0] ='\0'; parameter++; parameter[0] ='\0'; parameter++; - base64_decode_inplace(parameter); } else { - parameter[0] ='\0'; parameter++; parameter[0] ='\0'; parameter++; + parameter[0] ='\0'; + parameter++; + + base64_decode_inplace(parameter); } if (strequal(request, "LANMAN-Challenge")) { |