diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-03 17:22:04 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-03 12:33:36 -0600 |
| commit | 6f79af9d13cb400506e05f20fb68c7f97daccf38 (patch) | |
| tree | 97855c54cc65fc5af21c210f43aeb6d773886e94 /source4/auth/ntlmssp/ntlmssp_parse.c | |
| parent | 425732f688865ebe2bfe568c8278edec50cbdedf (diff) | |
| download | samba-6f79af9d13cb400506e05f20fb68c7f97daccf38.tar.gz samba-6f79af9d13cb400506e05f20fb68c7f97daccf38.tar.bz2 samba-6f79af9d13cb400506e05f20fb68c7f97daccf38.zip | |
r26652: msrpc_parse/msrpc_gen: Add iconv_convenience argument.
(This used to be commit e886f1bc0dc694971979716d1991535c7d2e08de)
Diffstat (limited to 'source4/auth/ntlmssp/ntlmssp_parse.c')
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_parse.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp_parse.c b/source4/auth/ntlmssp/ntlmssp_parse.c index bb2d7a14a8..8e31d814d0 100644 --- a/source4/auth/ntlmssp/ntlmssp_parse.c +++ b/source4/auth/ntlmssp/ntlmssp_parse.c @@ -41,7 +41,9 @@ d = word (4 bytes) C = constant ascii string */ -bool msrpc_gen(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, +bool msrpc_gen(TALLOC_CTX *mem_ctx, + struct smb_iconv_convenience *iconv_convenience, + DATA_BLOB *blob, const char *format, ...) { int i; @@ -65,7 +67,7 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, case 'U': s = va_arg(ap, char *); head_size += 8; - n = push_ucs2_talloc(pointers, lp_iconv_convenience(global_loadparm), (void **)&pointers[i].data, s); + n = push_ucs2_talloc(pointers, iconv_convenience, (void **)&pointers[i].data, s); if (n == -1) { return false; } @@ -76,7 +78,7 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, case 'A': s = va_arg(ap, char *); head_size += 8; - n = push_ascii_talloc(pointers, lp_iconv_convenience(global_loadparm), (char **)&pointers[i].data, s); + n = push_ascii_talloc(pointers, iconv_convenience, (char **)&pointers[i].data, s); if (n == -1) { return false; } @@ -88,7 +90,7 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, n = va_arg(ap, int); intargs[i] = n; s = va_arg(ap, char *); - n = push_ucs2_talloc(pointers, lp_iconv_convenience(global_loadparm), (void **)&pointers[i].data, s); + n = push_ucs2_talloc(pointers, iconv_convenience, (void **)&pointers[i].data, s); if (n == -1) { return false; } @@ -199,7 +201,9 @@ if ((head_ofs + amount) > blob->length) { \ C = constant ascii string */ -bool msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, +bool msrpc_parse(TALLOC_CTX *mem_ctx, + struct smb_iconv_convenience *iconv_convenience, + const DATA_BLOB *blob, const char *format, ...) { int i; @@ -244,7 +248,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, } if (0 < len1) { - pull_string(lp_iconv_convenience(global_loadparm), p, blob->data + ptr, p_len, + pull_string(iconv_convenience, p, blob->data + ptr, p_len, len1, STR_UNICODE|STR_NOALIGN); (*ps) = talloc_strdup(mem_ctx, p); if (!(*ps)) { @@ -279,7 +283,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, } if (0 < len1) { - pull_string(lp_iconv_convenience(global_loadparm), p, blob->data + ptr, p_len, + pull_string(iconv_convenience, p, blob->data + ptr, p_len, len1, STR_ASCII|STR_NOALIGN); (*ps) = talloc_strdup(mem_ctx, p); if (!(*ps)) { @@ -344,7 +348,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, goto cleanup; } - head_ofs += pull_string(lp_iconv_convenience(global_loadparm), p, + head_ofs += pull_string(iconv_convenience, p, blob->data+head_ofs, p_len, blob->length - head_ofs, STR_ASCII|STR_TERMINATE); |