diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-30 22:08:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:15 -0500 |
| commit | 819eeaef328fcc330700b2626d17c5447ffd3589 (patch) | |
| tree | 12a799adee76d776312d199d2dc70b7dbec70233 /source4/auth/ntlmssp/ntlmssp_parse.c | |
| parent | e3b8d856aae403f8b540d6c983303226ca20b4a8 (diff) | |
| download | samba-819eeaef328fcc330700b2626d17c5447ffd3589.tar.gz samba-819eeaef328fcc330700b2626d17c5447ffd3589.tar.bz2 samba-819eeaef328fcc330700b2626d17c5447ffd3589.zip | |
r10663: Eliminate use of pstring
(This used to be commit 57cfbe51e61e27098fad3f9b1113c6f8f69f9a55)
Diffstat (limited to 'source4/auth/ntlmssp/ntlmssp_parse.c')
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_parse.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp_parse.c b/source4/auth/ntlmssp/ntlmssp_parse.c index 42546cb130..fa839b43d8 100644 --- a/source4/auth/ntlmssp/ntlmssp_parse.c +++ b/source4/auth/ntlmssp/ntlmssp_parse.c @@ -21,7 +21,6 @@ */ #include "includes.h" -#include "pstring.h" /* this is a tiny msrpc packet generator. I am only using this to @@ -210,7 +209,7 @@ BOOL msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, uint16_t len1, len2; uint32_t ptr; uint32_t *v; - pstring p; + char *p; va_start(ap, format); for (i=0; format[i]; i++) { @@ -237,13 +236,10 @@ BOOL msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, return False; if (0 < len1) { - pull_string(p, blob->data + ptr, sizeof(p), - len1, - STR_UNICODE|STR_NOALIGN); - (*ps) = talloc_strdup(mem_ctx, p); - if (!(*ps)) { + if (convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX, blob->data + ptr, len1, (void **)&p) < 0) { return False; } + (*ps) = p; } else { (*ps) = ""; } |