Changeset 862 for trunk/server/lib/addns/dnsgss.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/addns/dnsgss.c (modified) (2 diffs)

trunk/server/lib/addns/dnsgss.c

@@ -165 +165 @@
                         struct dns_buffer *buf;
                         struct dns_tkey_record *tkey;
+                        struct dns_rrec *tkey_answer = NULL;
+                        uint16_t i;
 
                         err = dns_receive(mem_ctx, conn, &buf);
@@ -175 +177 @@
                          * TODO: Compare id and keyname
                          */
-                        
-                        if ((resp->num_additionals != 1) ||
-                            (resp->num_answers == 0) ||
-                            (resp->answers[0]->type != QTYPE_TKEY)) {
+
+                        for (i=0; i < resp->num_answers; i++) {
+                                if (resp->answers[i]->type != QTYPE_TKEY) {
+                                        continue;
+                                }
+
+                                tkey_answer = resp->answers[i];
+                        }
+
+                        if (tkey_answer == NULL) {
                                 err = ERROR_DNS_INVALID_MESSAGE;
                                 goto error;