r26638: libndr: Require explicitly specifying iconv_convenience for ndr_struct_push_b...

[ira/wip.git] / source4 / libcli / nbt / nbtname.c

diff --git a/source4/libcli/nbt/nbtname.c b/source4/libcli/nbt/nbtname.c
index c6fc18f55a31f9c9fcac8a93c4501586fddf38ec..079d0595de25c9c4e3e03ef3c5e99c8c0bdadee4 100644 (file)
--- a/source4/libcli/nbt/nbtname.c
+++ b/source4/libcli/nbt/nbtname.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,


@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */
 
 /*
 */
 
 /*


@@ -25,17 +24,18 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "system/iconv.h"

 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "librpc/gen_ndr/ndr_misc.h"

+#include "system/locale.h"
+#include "param/param.h"

 
 /* don't allow an unlimited number of name components */
 #define MAX_COMPONENTS 10
 
 
 /* don't allow an unlimited number of name components */
 #define MAX_COMPONENTS 10
 

-/*
+/**

   print a nbt string
 */
   print a nbt string
 */

-void ndr_print_nbt_string(struct ndr_print *ndr, const char *name, const char *s)
+_PUBLIC_ void ndr_print_nbt_string(struct ndr_print *ndr, const char *name, const char *s)

 {
        ndr_print_string(ndr, name, s);
 }
 {
        ndr_print_string(ndr, name, s);
 }


@@ -43,26 +43,30 @@ void ndr_print_nbt_string(struct ndr_print *ndr, const char *name, const char *s
 /*
   pull one component of a nbt_string
 */
 /*
   pull one component of a nbt_string
 */

-static NTSTATUS ndr_pull_component(struct ndr_pull *ndr, uint8_t **component,
-                                  uint32_t *offset, uint32_t *max_offset)
+static enum ndr_err_code ndr_pull_component(struct ndr_pull *ndr,
+                                           uint8_t **component,
+                                           uint32_t *offset,
+                                           uint32_t *max_offset)

 {
        uint8_t len;
        uint_t loops = 0;
        while (loops < 5) {
                if (*offset >= ndr->data_size) {
 {
        uint8_t len;
        uint_t loops = 0;
        while (loops < 5) {
                if (*offset >= ndr->data_size) {

-                       return NT_STATUS_BAD_NETWORK_NAME;
+                       return ndr_pull_error(ndr, NDR_ERR_STRING,
+                                             "BAD NBT NAME component");

                }
                len = ndr->data[*offset];
                if (len == 0) {
                        *offset += 1;
                        *max_offset = MAX(*max_offset, *offset);
                        *component = NULL;
                }
                len = ndr->data[*offset];
                if (len == 0) {
                        *offset += 1;
                        *max_offset = MAX(*max_offset, *offset);
                        *component = NULL;

-                       return NT_STATUS_OK;
+                       return NDR_ERR_SUCCESS;

                }
                if ((len & 0xC0) == 0xC0) {
                        /* its a label pointer */
                        if (1 + *offset >= ndr->data_size) {
                }
                if ((len & 0xC0) == 0xC0) {
                        /* its a label pointer */
                        if (1 + *offset >= ndr->data_size) {

-                               return NT_STATUS_BAD_NETWORK_NAME;
+                               return ndr_pull_error(ndr, NDR_ERR_STRING,
+                                                     "BAD NBT NAME component");

                        }
                        *max_offset = MAX(*max_offset, *offset + 2);
                        *offset = ((len&0x3F)<<8) | ndr->data[1 + *offset];
                        }
                        *max_offset = MAX(*max_offset, *offset + 2);
                        *offset = ((len&0x3F)<<8) | ndr->data[1 + *offset];


@@ -72,35 +76,36 @@ static NTSTATUS ndr_pull_component(struct ndr_pull *ndr, uint8_t **component,
                }
                if ((len & 0xC0) != 0) {
                        /* its a reserved length field */
                }
                if ((len & 0xC0) != 0) {
                        /* its a reserved length field */

-                       return NT_STATUS_BAD_NETWORK_NAME;
+                       return ndr_pull_error(ndr, NDR_ERR_STRING,
+                                             "BAD NBT NAME component");

                }
                if (*offset + len + 2 > ndr->data_size) {
                }
                if (*offset + len + 2 > ndr->data_size) {

-                       return NT_STATUS_BAD_NETWORK_NAME;
+                       return ndr_pull_error(ndr, NDR_ERR_STRING,
+                                             "BAD NBT NAME component");

                }
                *component = (uint8_t*)talloc_strndup(ndr, (const char *)&ndr->data[1 + *offset], len);
                }
                *component = (uint8_t*)talloc_strndup(ndr, (const char *)&ndr->data[1 + *offset], len);

-               NT_STATUS_HAVE_NO_MEMORY(*component);
+               NDR_ERR_HAVE_NO_MEMORY(*component);

                *offset += len + 1;
                *max_offset = MAX(*max_offset, *offset);
                *offset += len + 1;
                *max_offset = MAX(*max_offset, *offset);

-               return NT_STATUS_OK;
+               return NDR_ERR_SUCCESS;

        }
 
        /* too many pointers */
        }
 
        /* too many pointers */

-       return NT_STATUS_BAD_NETWORK_NAME;
+       return ndr_pull_error(ndr, NDR_ERR_STRING, "BAD NBT NAME component");

 }
 
 }
 

-/*
+/**

   pull a nbt_string from the wire
 */
   pull a nbt_string from the wire
 */

-NTSTATUS ndr_pull_nbt_string(struct ndr_pull *ndr, int ndr_flags, const char **s)
+_PUBLIC_ enum ndr_err_code ndr_pull_nbt_string(struct ndr_pull *ndr, int ndr_flags, const char **s)

 {
 {

-       NTSTATUS status;

        uint32_t offset = ndr->offset;
        uint32_t max_offset = offset;
        unsigned num_components;
        char *name;
 
        if (!(ndr_flags & NDR_SCALARS)) {
        uint32_t offset = ndr->offset;
        uint32_t max_offset = offset;
        unsigned num_components;
        char *name;
 
        if (!(ndr_flags & NDR_SCALARS)) {

-               return NT_STATUS_OK;
+               return NDR_ERR_SUCCESS;

        }
 
        name = NULL;
        }
 
        name = NULL;


@@ -108,41 +113,41 @@ NTSTATUS ndr_pull_nbt_string(struct ndr_pull *ndr, int ndr_flags, const char **s
        /* break up name into a list of components */
        for (num_components=0;num_components<MAX_COMPONENTS;num_components++) {
                uint8_t *component;
        /* break up name into a list of components */
        for (num_components=0;num_components<MAX_COMPONENTS;num_components++) {
                uint8_t *component;

-               status = ndr_pull_component(ndr, &component, &offset, &max_offset);
-               NT_STATUS_NOT_OK_RETURN(status);
+               NDR_CHECK(ndr_pull_component(ndr, &component, &offset, &max_offset));

                if (component == NULL) break;
                if (name) {
                if (component == NULL) break;
                if (name) {

-                       name = talloc_asprintf_append(name, ".%s", component);
-                       NT_STATUS_HAVE_NO_MEMORY(name);
+                       name = talloc_asprintf_append_buffer(name, ".%s", component);
+                       NDR_ERR_HAVE_NO_MEMORY(name);

                } else {
                        name = (char *)component;
                }
        }
        if (num_components == MAX_COMPONENTS) {
                } else {
                        name = (char *)component;
                }
        }
        if (num_components == MAX_COMPONENTS) {

-               return NT_STATUS_BAD_NETWORK_NAME;
+               return ndr_pull_error(ndr, NDR_ERR_STRING,
+                                     "BAD NBT NAME too many components");

        }
        if (num_components == 0) {
                name = talloc_strdup(ndr, "");
        }
        if (num_components == 0) {
                name = talloc_strdup(ndr, "");

-               NT_STATUS_HAVE_NO_MEMORY(name);
+               NDR_ERR_HAVE_NO_MEMORY(name);

        }
 
        (*s) = name;
        ndr->offset = max_offset;
 
        }
 
        (*s) = name;
        ndr->offset = max_offset;
 

-       return NT_STATUS_OK;
+       return NDR_ERR_SUCCESS;

 }
 
 }
 

-/*
+/**

   push a nbt string to the wire
 */
   push a nbt string to the wire
 */

-NTSTATUS ndr_push_nbt_string(struct ndr_push *ndr, int ndr_flags, const char *s)
+_PUBLIC_ enum ndr_err_code ndr_push_nbt_string(struct ndr_push *ndr, int ndr_flags, const char *s)

 {
        if (!(ndr_flags & NDR_SCALARS)) {
 {
        if (!(ndr_flags & NDR_SCALARS)) {

-               return NT_STATUS_OK;
+               return NDR_ERR_SUCCESS;

        }
 
        while (s && *s) {
        }
 
        while (s && *s) {

-               NTSTATUS status;
+               enum ndr_err_code ndr_err;

                char *compname;
                size_t complen;
                uint32_t offset;
                char *compname;
                size_t complen;
                uint32_t offset;


@@ -150,8 +155,8 @@ NTSTATUS ndr_push_nbt_string(struct ndr_push *ndr, int ndr_flags, const char *s)
                /* see if we have pushed the remaing string allready,
                 * if so we use a label pointer to this string
                 */
                /* see if we have pushed the remaing string allready,
                 * if so we use a label pointer to this string
                 */

-               status = ndr_token_retrieve_cmp_fn(&ndr->nbt_string_list, s, &offset, (comparison_fn_t)strcmp, False);
-               if (NT_STATUS_IS_OK(status)) {
+               ndr_err = ndr_token_retrieve_cmp_fn(&ndr->nbt_string_list, s, &offset, (comparison_fn_t)strcmp, false);
+               if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {

                        uint8_t b[2];
                        
                        if (offset > 0x3FFF) {
                        uint8_t b[2];
                        
                        if (offset > 0x3FFF) {


@@ -179,7 +184,7 @@ NTSTATUS ndr_push_nbt_string(struct ndr_push *ndr, int ndr_flags, const char *s)
                                                (unsigned char)complen,
                                                (unsigned char)complen,
                                                (unsigned char)complen, s);
                                                (unsigned char)complen,
                                                (unsigned char)complen,
                                                (unsigned char)complen, s);

-               NT_STATUS_HAVE_NO_MEMORY(compname);
+               NDR_ERR_HAVE_NO_MEMORY(compname);

 
                /* remember the current componemt + the rest of the string
                 * so it can be reused later
 
                /* remember the current componemt + the rest of the string
                 * so it can be reused later


@@ -204,7 +209,7 @@ NTSTATUS ndr_push_nbt_string(struct ndr_push *ndr, int ndr_flags, const char *s)
 /*
   decompress a 'compressed' name component
  */
 /*
   decompress a 'compressed' name component
  */

-static NTSTATUS decompress_name(char *name, enum nbt_name_type *type)
+static bool decompress_name(char *name, enum nbt_name_type *type)

 {
        int i;
        for (i=0;name[2*i];i++) {
 {
        int i;
        for (i=0;name[2*i];i++) {


@@ -212,7 +217,7 @@ static NTSTATUS decompress_name(char *name, enum nbt_name_type *type)
                uint8_t c2 = name[1+(2*i)];
                if (c1 < 'A' || c1 > 'P' ||
                    c2 < 'A' || c2 > 'P') {
                uint8_t c2 = name[1+(2*i)];
                if (c1 < 'A' || c1 > 'P' ||
                    c2 < 'A' || c2 > 'P') {

-                       return NT_STATUS_BAD_NETWORK_NAME;
+                       return false;

                }
                name[i] = ((c1-'A')<<4) | (c2-'A');                 
        }
                }
                name[i] = ((c1-'A')<<4) | (c2-'A');                 
        }


@@ -230,7 +235,7 @@ static NTSTATUS decompress_name(char *name, enum nbt_name_type *type)
                name[i-1] = 0;
        }
        
                name[i-1] = 0;
        }
        

-       return NT_STATUS_OK;
+       return true;

 }
 
 
 }
 
 


@@ -274,28 +279,27 @@ static uint8_t *compress_name(TALLOC_CTX *mem_ctx,
 }
 
 
 }
 
 

-/*
+/**

   pull a nbt name from the wire
 */
   pull a nbt name from the wire
 */

-NTSTATUS ndr_pull_nbt_name(struct ndr_pull *ndr, int ndr_flags, struct nbt_name *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_nbt_name(struct ndr_pull *ndr, int ndr_flags, struct nbt_name *r)

 {
 {

-       NTSTATUS status;

        uint8_t *scope;
        char *cname;
        const char *s;
        uint8_t *scope;
        char *cname;
        const char *s;

+       bool ok;

 
        if (!(ndr_flags & NDR_SCALARS)) {
 
        if (!(ndr_flags & NDR_SCALARS)) {

-               return NT_STATUS_OK;
+               return NDR_ERR_SUCCESS;

        }
 
        }
 

-       status = ndr_pull_nbt_string(ndr, ndr_flags, &s);
-       NT_STATUS_NOT_OK_RETURN(status);
+       NDR_CHECK(ndr_pull_nbt_string(ndr, ndr_flags, &s));

 
        scope = (uint8_t *)strchr(s, '.');
        if (scope) {
                *scope = 0;
                r->scope = talloc_strdup(ndr->current_mem_ctx, (const char *)&scope[1]);
 
        scope = (uint8_t *)strchr(s, '.');
        if (scope) {
                *scope = 0;
                r->scope = talloc_strdup(ndr->current_mem_ctx, (const char *)&scope[1]);

-               NT_STATUS_HAVE_NO_MEMORY(r->scope);
+               NDR_ERR_HAVE_NO_MEMORY(r->scope);

        } else {
                r->scope = NULL;
        }
        } else {
                r->scope = NULL;
        }


@@ -305,54 +309,64 @@ NTSTATUS ndr_pull_nbt_name(struct ndr_pull *ndr, int ndr_flags, struct nbt_name
        /* the first component is limited to 16 bytes in the DOS charset,
           which is 32 in the 'compressed' form */
        if (strlen(cname) > 32) {
        /* the first component is limited to 16 bytes in the DOS charset,
           which is 32 in the 'compressed' form */
        if (strlen(cname) > 32) {

-               return NT_STATUS_BAD_NETWORK_NAME;
+               return ndr_pull_error(ndr, NDR_ERR_STRING,
+                                     "NBT NAME cname > 32");

        }
 
        /* decompress the first component */
        }
 
        /* decompress the first component */

-       status = decompress_name(cname, &r->type);
-       NT_STATUS_NOT_OK_RETURN(status);
+       ok = decompress_name(cname, &r->type);
+       if (!ok) {
+               return ndr_pull_error(ndr, NDR_ERR_STRING,
+                                     "NBT NAME failed to decompress");
+       }

 
        r->name = talloc_strdup(ndr->current_mem_ctx, cname);
 
        r->name = talloc_strdup(ndr->current_mem_ctx, cname);

-       NT_STATUS_HAVE_NO_MEMORY(r->name);
+       NDR_ERR_HAVE_NO_MEMORY(r->name);

 
        talloc_free(cname);
 
 
        talloc_free(cname);
 

-       return NT_STATUS_OK;
+       return NDR_ERR_SUCCESS;

 }
 
 }
 

-/*
+/**

   push a nbt name to the wire
 */
   push a nbt name to the wire
 */

-NTSTATUS ndr_push_nbt_name(struct ndr_push *ndr, int ndr_flags, const struct nbt_name *r)
+_PUBLIC_ enum ndr_err_code ndr_push_nbt_name(struct ndr_push *ndr, int ndr_flags, const struct nbt_name *r)

 {
        uint8_t *cname, *fullname;
 {
        uint8_t *cname, *fullname;

-       NTSTATUS status;
+       enum ndr_err_code ndr_err;

 
        if (!(ndr_flags & NDR_SCALARS)) {
 
        if (!(ndr_flags & NDR_SCALARS)) {

-               return NT_STATUS_OK;
+               return NDR_ERR_SUCCESS;
+       }
+
+       if (strlen(r->name) > 15) {
+               return ndr_push_error(ndr, NDR_ERR_STRING,
+                                     "nbt_name longer as 15 chars: %s",
+                                     r->name);

        }
 
        cname = compress_name(ndr, (const uint8_t *)r->name, r->type);
        }
 
        cname = compress_name(ndr, (const uint8_t *)r->name, r->type);

-       NT_STATUS_HAVE_NO_MEMORY(cname);
+       NDR_ERR_HAVE_NO_MEMORY(cname);

 
        if (r->scope) {
                fullname = (uint8_t *)talloc_asprintf(ndr, "%s.%s", cname, r->scope);
 
        if (r->scope) {
                fullname = (uint8_t *)talloc_asprintf(ndr, "%s.%s", cname, r->scope);

-               NT_STATUS_HAVE_NO_MEMORY(fullname);
+               NDR_ERR_HAVE_NO_MEMORY(fullname);

                talloc_free(cname);
        } else {
                fullname = cname;
        }
        
                talloc_free(cname);
        } else {
                fullname = cname;
        }
        

-       status = ndr_push_nbt_string(ndr, ndr_flags, (const char *)fullname);
+       ndr_err = ndr_push_nbt_string(ndr, ndr_flags, (const char *)fullname);

 
 

-       return status;
+       return ndr_err;

 }
 
 
 }
 
 

-/*
+/**

   copy a nbt name structure
 */
   copy a nbt name structure
 */

-NTSTATUS nbt_name_dup(TALLOC_CTX *mem_ctx, struct nbt_name *name, struct nbt_name *newname)
+_PUBLIC_ NTSTATUS nbt_name_dup(TALLOC_CTX *mem_ctx, struct nbt_name *name, struct nbt_name *newname)

 {
        *newname = *name;
        newname->name = talloc_strdup(mem_ctx, newname->name);
 {
        *newname = *name;
        newname->name = talloc_strdup(mem_ctx, newname->name);


@@ -364,39 +378,51 @@ NTSTATUS nbt_name_dup(TALLOC_CTX *mem_ctx, struct nbt_name *name, struct nbt_nam
        return NT_STATUS_OK;
 }
 
        return NT_STATUS_OK;
 }
 

-/*
+/**

   push a nbt name into a blob
 */
   push a nbt name into a blob
 */

-NTSTATUS nbt_name_to_blob(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, struct nbt_name *name)
+_PUBLIC_ NTSTATUS nbt_name_to_blob(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, struct nbt_name *name)

 {
 {

-       return ndr_push_struct_blob(blob, mem_ctx, name, 
-                                   (ndr_push_flags_fn_t)ndr_push_nbt_name);
-}
+       enum ndr_err_code ndr_err;
+
+       ndr_err = ndr_push_struct_blob(blob, mem_ctx, lp_iconv_convenience(global_loadparm), name, (ndr_push_flags_fn_t)ndr_push_nbt_name);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               return ndr_map_error2ntstatus(ndr_err);
+       }

 
 

+       return NT_STATUS_OK;
+}

 
 

-/*
+/**

   pull a nbt name from a blob
 */
   pull a nbt name from a blob
 */

-NTSTATUS nbt_name_from_blob(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, struct nbt_name *name)
+_PUBLIC_ NTSTATUS nbt_name_from_blob(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, struct nbt_name *name)

 {
 {

-       return ndr_pull_struct_blob(blob, mem_ctx, name, 
-                                   (ndr_pull_flags_fn_t)ndr_pull_nbt_name);
+       enum ndr_err_code ndr_err;
+
+       ndr_err = ndr_pull_struct_blob(blob, mem_ctx, name,
+                                      (ndr_pull_flags_fn_t)ndr_pull_nbt_name);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               return ndr_map_error2ntstatus(ndr_err);
+       }
+
+       return NT_STATUS_OK;

 }
 
 
 }
 
 

-/*
+/**

   choose a name to use when calling a server in a NBT session request.
   we use heuristics to see if the name we have been given is a IP
   address, or a too-long name. If it is then use *SMBSERVER, or a
   truncated name
 */
   choose a name to use when calling a server in a NBT session request.
   we use heuristics to see if the name we have been given is a IP
   address, or a too-long name. If it is then use *SMBSERVER, or a
   truncated name
 */

-void nbt_choose_called_name(TALLOC_CTX *mem_ctx,
+_PUBLIC_ void nbt_choose_called_name(TALLOC_CTX *mem_ctx,

                            struct nbt_name *n, const char *name, int type)
 {
        n->scope = NULL;
        n->type = type;
 
                            struct nbt_name *n, const char *name, int type)
 {
        n->scope = NULL;
        n->type = type;
 

-       if (is_ipaddress(name)) {
+       if (is_ipaddress(name) || name == NULL) {

                n->name = "*SMBSERVER";
                return;
        }
                n->name = "*SMBSERVER";
                return;
        }


@@ -450,10 +476,10 @@ static const char *nbt_hex_encode(TALLOC_CTX *mem_ctx, const char *s)
 }
 
 
 }
 
 

-/*
+/**

   form a string for a NBT name
 */
   form a string for a NBT name
 */

-char *nbt_name_string(TALLOC_CTX *mem_ctx, const struct nbt_name *name)
+_PUBLIC_ char *nbt_name_string(TALLOC_CTX *mem_ctx, const struct nbt_name *name)

 {
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
        char *ret;
 {
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
        char *ret;


@@ -471,17 +497,17 @@ char *nbt_name_string(TALLOC_CTX *mem_ctx, const struct nbt_name *name)
        return ret;
 }
 
        return ret;
 }
 

-/*
+/**

   pull a nbt name, WINS Replication uses another on wire format for nbt name
 */
   pull a nbt name, WINS Replication uses another on wire format for nbt name
 */

-NTSTATUS ndr_pull_wrepl_nbt_name(struct ndr_pull *ndr, int ndr_flags, struct nbt_name **_r)
+_PUBLIC_ enum ndr_err_code ndr_pull_wrepl_nbt_name(struct ndr_pull *ndr, int ndr_flags, struct nbt_name **_r)

 {
        struct nbt_name *r;
        uint8_t *namebuf;
        uint32_t namebuf_len;
 
        if (!(ndr_flags & NDR_SCALARS)) {
 {
        struct nbt_name *r;
        uint8_t *namebuf;
        uint32_t namebuf_len;
 
        if (!(ndr_flags & NDR_SCALARS)) {

-               return NT_STATUS_OK;
+               return NDR_ERR_SUCCESS;

        }
 
        NDR_CHECK(ndr_pull_align(ndr, 4));
        }
 
        NDR_CHECK(ndr_pull_align(ndr, 4));


@@ -510,7 +536,7 @@ NTSTATUS ndr_pull_wrepl_nbt_name(struct ndr_pull *ndr, int ndr_flags, struct nbt
 
                talloc_free(namebuf);
                *_r = r;
 
                talloc_free(namebuf);
                *_r = r;

-               return NT_STATUS_OK;
+               return NDR_ERR_SUCCESS;

        }
 
        r->type = namebuf[15];
        }
 
        r->type = namebuf[15];


@@ -529,35 +555,42 @@ NTSTATUS ndr_pull_wrepl_nbt_name(struct ndr_pull *ndr, int ndr_flags, struct nbt
 
        talloc_free(namebuf);
        *_r = r;
 
        talloc_free(namebuf);
        *_r = r;

-       return NT_STATUS_OK;
+       return NDR_ERR_SUCCESS;

 }
 
 }
 

-/*
+/**

   push a nbt name, WINS Replication uses another on wire format for nbt name
 */
   push a nbt name, WINS Replication uses another on wire format for nbt name
 */

-NTSTATUS ndr_push_wrepl_nbt_name(struct ndr_push *ndr, int ndr_flags, const struct nbt_name *r)
+_PUBLIC_ enum ndr_err_code ndr_push_wrepl_nbt_name(struct ndr_push *ndr, int ndr_flags, const struct nbt_name *r)

 {
        uint8_t *namebuf;
        uint32_t namebuf_len;
        uint32_t name_len;
        uint32_t scope_len = 0;
 
 {
        uint8_t *namebuf;
        uint32_t namebuf_len;
        uint32_t name_len;
        uint32_t scope_len = 0;
 

-       if (r == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+       if (r == NULL) {
+               return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
+                                     "wrepl_nbt_name NULL pointer");
+       }

 
        if (!(ndr_flags & NDR_SCALARS)) {
 
        if (!(ndr_flags & NDR_SCALARS)) {

-               return NT_STATUS_OK;
+               return NDR_ERR_SUCCESS;

        }
 
        name_len = strlen(r->name);
        if (name_len > 15) {
        }
 
        name_len = strlen(r->name);
        if (name_len > 15) {

-               return NT_STATUS_INVALID_PARAMETER_MIX;
+               return ndr_push_error(ndr, NDR_ERR_STRING,
+                                     "wrepl_nbt_name longer as 15 chars: %s",
+                                     r->name);

        }
 
        if (r->scope) {
                scope_len = strlen(r->scope);
        }
        if (scope_len > 238) {
        }
 
        if (r->scope) {
                scope_len = strlen(r->scope);
        }
        if (scope_len > 238) {

-               return NT_STATUS_INVALID_PARAMETER_MIX;
+               return ndr_push_error(ndr, NDR_ERR_STRING,
+                                     "wrepl_nbt_name scope longer as 238 chars: %s",
+                                     r->scope);

        }
 
        namebuf = (uint8_t *)talloc_asprintf(ndr, "%-15s%c%s",
        }
 
        namebuf = (uint8_t *)talloc_asprintf(ndr, "%-15s%c%s",


@@ -584,10 +617,10 @@ NTSTATUS ndr_push_wrepl_nbt_name(struct ndr_push *ndr, int ndr_flags, const stru
        NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, namebuf, namebuf_len));
 
        talloc_free(namebuf);
        NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, namebuf, namebuf_len));
 
        talloc_free(namebuf);

-       return NT_STATUS_OK;
+       return NDR_ERR_SUCCESS;

 }
 
 }
 

-void ndr_print_wrepl_nbt_name(struct ndr_print *ndr, const char *name, const struct nbt_name *r)
+_PUBLIC_ void ndr_print_wrepl_nbt_name(struct ndr_print *ndr, const char *name, const struct nbt_name *r)

 {
        char *s = nbt_name_string(ndr, r);
        ndr_print_string(ndr, name, s);
 {
        char *s = nbt_name_string(ndr, r);
        ndr_print_string(ndr, name, s);