Changeset 989 for vendor/current/librpc/ndr

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/librpc/ndr

Files:

• libndr.h (modified) (1 diff)
• ndr_dns.c (modified) (3 diffs)

vendor/current/librpc/ndr/libndr.h

@@ -125 +125 @@
 #define LIBNDR_FLAG_STR_RAW8            (1<<13)
 #define LIBNDR_STRING_FLAGS             (0x7FFC)
+
+/* Disable string token compression  */
+#define LIBNDR_FLAG_NO_COMPRESSION      (1<<15)
 
 /*

vendor/current/librpc/ndr/ndr_dns.c

@@ -170 +170 @@
                 uint32_t offset;
 
-                /* see if we have pushed the remaining string already,
-                 * if so we use a label pointer to this string
-                 */
-                ndr_err = ndr_token_retrieve_cmp_fn(&ndr->dns_string_list, s,
-                                                    &offset,
-                                                    (comparison_fn_t)strcmp,
-                                                    false);
-                if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                        uint8_t b[2];
-
-                        if (offset > 0x3FFF) {
-                                return ndr_push_error(ndr, NDR_ERR_STRING,
-                                                      "offset for dns string " \
-                                                      "label pointer " \
-                                                      "%u[%08X] > 0x00003FFF",
-                                                      offset, offset);
+                if (!(ndr->flags & LIBNDR_FLAG_NO_COMPRESSION)) {
+                        /* see if we have pushed the remaining string already,
+                         * if so we use a label pointer to this string
+                         */
+                        ndr_err = ndr_token_retrieve_cmp_fn(&ndr->dns_string_list, s,
+                                                            &offset,
+                                                            (comparison_fn_t)strcmp,
+                                                            false);
+                        if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                                uint8_t b[2];
+
+                                if (offset > 0x3FFF) {
+                                        return ndr_push_error(ndr, NDR_ERR_STRING,
+                                                              "offset for dns string " \
+                                                              "label pointer " \
+                                                              "%u[%08X] > 0x00003FFF",
+                                                              offset, offset);
+                                }
+
+                                b[0] = 0xC0 | (offset>>8);
+                                b[1] = (offset & 0xFF);
+
+                                return ndr_push_bytes(ndr, b, 2);
                         }
-
-                        b[0] = 0xC0 | (offset>>8);
-                        b[1] = (offset & 0xFF);
-
-                        return ndr_push_bytes(ndr, b, 2);
                 }
 
@@ -214 +216 @@
                  * so it can be reused later
                  */
-                NDR_CHECK(ndr_token_store(ndr, &ndr->dns_string_list, s,
-                                          ndr->offset));
+                if (!(ndr->flags & LIBNDR_FLAG_NO_COMPRESSION)) {
+                        NDR_CHECK(ndr_token_store(ndr, &ndr->dns_string_list, s,
+                                                  ndr->offset));
+                }
 
                 /* push just this component into the blob */
@@ -265 +269 @@
                                    LIBNDR_FLAG_NOALIGN);
         if (ndr_flags & NDR_SCALARS) {
+                uint32_t _flags_save_name = ndr->flags;
+
                 NDR_CHECK(ndr_push_align(ndr, 4));
+
+                switch (r->rr_type) {
+                case DNS_QTYPE_TKEY:
+                case DNS_QTYPE_TSIG:
+                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NO_COMPRESSION);
+                        break;
+                default:
+                        break;
+                }
                 NDR_CHECK(ndr_push_dns_string(ndr, NDR_SCALARS, r->name));
+                ndr->flags = _flags_save_name;
+
                 NDR_CHECK(ndr_push_dns_qtype(ndr, NDR_SCALARS, r->rr_type));
                 NDR_CHECK(ndr_push_dns_qclass(ndr, NDR_SCALARS, r->rr_class));