dnsp: fixed parsing of dns_name structures

its not a pad byte, its a trailing zero

diff --git a/librpc/ndr/ndr_dnsp.c b/librpc/ndr/ndr_dnsp.c
index 256638aed3399e585aec6f44fd451cc1c28bfddf..77c2366d14d05eb4f44220c924a16db148c9a5cd 100644 (file)
--- a/librpc/ndr/ndr_dnsp.c
+++ b/librpc/ndr/ndr_dnsp.c
@@ -36,7 +36,7 @@ _PUBLIC_ void ndr_print_dnsp_name(struct ndr_print *ndr, const char *name,
 */
 _PUBLIC_ enum ndr_err_code ndr_pull_dnsp_name(struct ndr_pull *ndr, int ndr_flags, const char **name)
 {
-       uint8_t len, count;
+       uint8_t len, count, final;
        int i;
        uint32_t total_len;
        char *ret;
@@ -68,14 +68,15 @@ _PUBLIC_ enum ndr_err_code ndr_pull_dnsp_name(struct ndr_pull *ndr, int ndr_flag
                ret[newlen-1] = 0;
                total_len = newlen;
        }
+       NDR_CHECK(ndr_pull_uint8(ndr, ndr_flags, &final));
        (*name) = ret;
-       NDR_PULL_ALIGN(ndr, 2);
        return NDR_ERR_SUCCESS;
 }
 
 enum ndr_err_code ndr_push_dnsp_name(struct ndr_push *ndr, int ndr_flags, const char *name)
 {
        int count, total_len, i;
+
        /* count the dots */
        for (count=i=0; name[i]; i++) {
                if (name[i] == '.') count++;
@@ -94,7 +95,7 @@ enum ndr_err_code ndr_push_dnsp_name(struct ndr_push *ndr, int ndr_flags, const
                NDR_CHECK(ndr_push_bytes(ndr, (const uint8_t *)name, sublen));
                name += sublen + 1;
        }
-       NDR_PUSH_ALIGN(ndr, 2);
+       NDR_CHECK(ndr_push_uint8(ndr, ndr_flags, 0));
 
        return NDR_ERR_SUCCESS;
 }