r10663: Eliminate use of pstring

[kai/samba.git] / source4 / auth / ntlmssp / ntlmssp_parse.c

diff --git a/source4/auth/ntlmssp/ntlmssp_parse.c b/source4/auth/ntlmssp/ntlmssp_parse.c
index 42546cb13083f6d871a60dbb890ad150253657be..fa839b43d8e796c7ec5fe744e489e3c115559e8b 100644 (file)
--- 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) = "";
                                }