diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 03:40:09 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 03:40:09 +0200 |
| commit | 922a29992ee38b8e1c851192677b89a2cd59a91a (patch) | |
| tree | 9ea2826f7fd77b27d16de8be61ca7940fb066bad /source4/auth/ntlmssp/ntlmssp_parse.c | |
| parent | 23b04a31f14dca0a3f9bcd58181f84db4b6092c7 (diff) | |
| download | samba-922a29992ee38b8e1c851192677b89a2cd59a91a.tar.gz samba-922a29992ee38b8e1c851192677b89a2cd59a91a.tar.bz2 samba-922a29992ee38b8e1c851192677b89a2cd59a91a.zip | |
Remove iconv_convenience parameter from simple string push/pull
functions.
Diffstat (limited to 'source4/auth/ntlmssp/ntlmssp_parse.c')
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_parse.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp_parse.c b/source4/auth/ntlmssp/ntlmssp_parse.c index 9256872036..cd270590f1 100644 --- a/source4/auth/ntlmssp/ntlmssp_parse.c +++ b/source4/auth/ntlmssp/ntlmssp_parse.c @@ -42,7 +42,6 @@ C = constant ascii string */ bool msrpc_gen(TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *iconv_convenience, DATA_BLOB *blob, const char *format, ...) { @@ -67,7 +66,7 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx, case 'U': s = va_arg(ap, char *); head_size += 8; - n = push_ucs2_talloc(pointers, iconv_convenience, (void **)&pointers[i].data, s); + n = push_ucs2_talloc(pointers, (void **)&pointers[i].data, s); if (n == -1) { return false; } @@ -78,7 +77,7 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx, case 'A': s = va_arg(ap, char *); head_size += 8; - n = push_ascii_talloc(pointers, iconv_convenience, (char **)&pointers[i].data, s); + n = push_ascii_talloc(pointers, (char **)&pointers[i].data, s); if (n == -1) { return false; } @@ -90,7 +89,7 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx, n = va_arg(ap, int); intargs[i] = n; s = va_arg(ap, char *); - n = push_ucs2_talloc(pointers, iconv_convenience, (void **)&pointers[i].data, s); + n = push_ucs2_talloc(pointers, (void **)&pointers[i].data, s); if (n == -1) { return false; } @@ -248,7 +247,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, } if (0 < len1) { - pull_string(iconv_convenience, p, blob->data + ptr, p_len, + pull_string(p, blob->data + ptr, p_len, len1, STR_UNICODE|STR_NOALIGN); (*ps) = talloc_strdup(mem_ctx, p); if (!(*ps)) { @@ -283,7 +282,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, } if (0 < len1) { - pull_string(iconv_convenience, p, blob->data + ptr, p_len, + pull_string(p, blob->data + ptr, p_len, len1, STR_ASCII|STR_NOALIGN); (*ps) = talloc_strdup(mem_ctx, p); if (!(*ps)) { @@ -348,7 +347,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, goto cleanup; } - head_ofs += pull_string(iconv_convenience, p, + head_ofs += pull_string(p, blob->data+head_ofs, p_len, blob->length - head_ofs, STR_ASCII|STR_TERMINATE); |