mDNSResponder-544.tar.gz

diff --git a/Makefile b/Makefile
index b0d94aed57a1d5c82a61fcd0d20eef37310e65b4..606c129cdd024221476e79a4e558afa58df39241 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 
 include $(MAKEFILEPATH)/pb_makefiles/platform.make
 
-MVERS = "mDNSResponder-541"
+MVERS = "mDNSResponder-544"
 
 DDNSWRITECONFIG = "$(DSTROOT)/Library/Application Support/Bonjour/ddnswriteconfig"
 VER = 

diff --git a/mDNSMacOSX/helper.c b/mDNSMacOSX/helper.c
index 36b92f8ec4341d210b13bb9917337fafe72bd078..0251e70963a7c9b0a28de44170356973cfdfb666 100644 (file)
--- a/mDNSMacOSX/helper.c
+++ b/mDNSMacOSX/helper.c
@@ -85,7 +85,6 @@ void TCPCheckSum(int af, struct tcphdr *t, int tcplen, v6addr_t sadd6, v6addr_t
 
 uid_t mDNSResponderUID;
 gid_t mDNSResponderGID;
-static const char kTunnelAddressInterface[] = "lo0";
 
 void
 debug_(const char *func, const char *fmt, ...)
@@ -698,12 +697,13 @@ enum DNSKeyFormat
 // therefore I need to add some byte swapping in this API to make this four-character string backwards too."
 // To cope with this we allow *both* "ddns" and "sndd" as valid item types.
 
+
+#ifndef NO_SECURITYFRAMEWORK
+static const char btmmprefix[] = "btmmdns:";
 static const char dnsprefix[] = "dns:";
 static const char ddns[] = "ddns";
 static const char ddnsrev[] = "sndd";
-static const char btmmprefix[] = "btmmdns:";
 
-#ifndef NO_SECURITYFRAMEWORK
 static enum DNSKeyFormat
 getDNSKeyFormat(SecKeychainItemRef item, SecKeychainAttributeList **attributesp)
 {

diff --git a/mDNSMacOSX/mDNSMacOSX.c b/mDNSMacOSX/mDNSMacOSX.c
index 6547b10038d143a872e98322b87ca4dec2518a54..fda595c916478932284f0ad4946c02928cbbae33 100644 (file)
--- a/mDNSMacOSX/mDNSMacOSX.c
+++ b/mDNSMacOSX/mDNSMacOSX.c
@@ -248,9 +248,10 @@ mDNSlocal void PrintHex(mDNSu8 *data, mDNSu16 len);
 typedef struct D2DRecordListElem
 {
     struct D2DRecordListElem *next;
-    AuthRecord               ar;
     D2DServiceInstance       instanceHandle;
     D2DTransportType         transportType;
+    AuthRecord               ar;    // must be last in the structure to accomodate extra space
+                                    // allocated for large records.
 } D2DRecordListElem;
 
 static D2DRecordListElem *D2DRecords = NULL; // List of records returned with D2DServiceFound events

diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
index 3218a75b19364bb5d9c79d05e6ee7914fe0cd7b6..953bf64f34c6c0e7a48296d08e6d50e114a43577 100755 (executable)
--- a/mDNSPosix/mDNSPosix.c
+++ b/mDNSPosix/mDNSPosix.c
@@ -1555,7 +1555,7 @@ mDNSexport mDNSs32 mDNSPlatformGetServiceID(mDNS *const m, DNSQuestion *q)
 {
     (void) m;
     (void) q;
-    return 0;
+    return -1;
 }
 
 mDNSexport void mDNSPlatformSetDelegatePID(UDPSocket *src, const mDNSAddr *dst, DNSQuestion *q)

diff --git a/mDNSShared/dns_sd.h b/mDNSShared/dns_sd.h
index 70ca06ea64be188e4c7977859c1048b8f83e625e..99373de66d802c7c6c97cb073bf0057104aabb7c 100644 (file)
--- a/mDNSShared/dns_sd.h
+++ b/mDNSShared/dns_sd.h
@@ -77,7 +77,7 @@
  */
 
 #ifndef _DNS_SD_H
-#define _DNS_SD_H 5410000
+#define _DNS_SD_H 5440000
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/mDNSWindows/mDNSWin32.c b/mDNSWindows/mDNSWin32.c
index bfab745f25c9b99bb6e134fea24154082e2b3186..fd11c58a7a8ae8e082c0c423d7d26441821f4a0a 100755 (executable)
--- a/mDNSWindows/mDNSWin32.c
+++ b/mDNSWindows/mDNSWin32.c
@@ -2192,7 +2192,7 @@ mDNSexport mDNSs32 mDNSPlatformGetServiceID(mDNS *const m, DNSQuestion *q)
     {
     (void) m;
     (void) q;
-    return 0;
+    return -1;
     }
 
 mDNSexport void mDNSPlatformSetDelegatePID(UDPSocket *src, const mDNSAddr *dst, DNSQuestion *q)