diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-04-07 09:27:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:09 -0500 |
| commit | 82285f2e0efe2b2c741268f8bbe80510e5b00f28 (patch) | |
| tree | a22c5924c75ca799eb2be2370212fc86b04fbffc | |
| parent | 1db9257c953c93c3f26596a535e4f26b609e7955 (diff) | |
| download | samba-82285f2e0efe2b2c741268f8bbe80510e5b00f28.tar.gz samba-82285f2e0efe2b2c741268f8bbe80510e5b00f28.tar.bz2 samba-82285f2e0efe2b2c741268f8bbe80510e5b00f28.zip | |
r104: Fix ntlm_auth by adding the new strhex_to_data_blob() call.
Andrew Bartlett
(This used to be commit 0693b9e79fabd58491f8aaec11dbbc71fab34f80)
| -rw-r--r-- | source3/lib/util_str.c | 11 | ||||
| -rw-r--r-- | source3/utils/ntlm_auth.c | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 2be8b7eb64..e4b07a4b73 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -794,6 +794,17 @@ size_t strhex_to_str(char *p, size_t len, const char *strhex) return num_chars; } +DATA_BLOB strhex_to_data_blob(const char *strhex) +{ + DATA_BLOB ret_blob = data_blob(NULL, strlen(strhex)/2+1); + + ret_blob.length = strhex_to_str(ret_blob.data, + strlen(strhex), + strhex); + + return ret_blob; +} + /** * Routine to print a buffer as HEX digits, into an allocated string. */ diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index 09306adc78..c926d07698 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -2166,18 +2166,14 @@ enum { while((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { case OPT_CHALLENGE: -#if 0 /* Mr Bartlett FIX THE BUILD ! */ opt_challenge = strhex_to_data_blob(hex_challenge); -#endif if (opt_challenge.length != 8) { x_fprintf(x_stderr, "hex decode of %s failed!\n", hex_challenge); exit(1); } break; case OPT_LM: -#if 0 /* Mr Bartlett FIX THE BUILD ! */ opt_lm_response = strhex_to_data_blob(hex_lm_response); -#endif if (opt_lm_response.length != 24) { x_fprintf(x_stderr, "hex decode of %s failed!\n", hex_lm_response); exit(1); @@ -2185,9 +2181,7 @@ enum { break; case OPT_NT: -#if 0 /* Mr Bartlett FIX THE BUILD ! */ opt_nt_response = strhex_to_data_blob(hex_nt_response); -#endif if (opt_nt_response.length < 24) { x_fprintf(x_stderr, "hex decode of %s failed!\n", hex_nt_response); exit(1); |