Merge remote branch 'origin/develop' into nohex

diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c
index e282002e4a37b02dd761a82f85446543be2887c3..fdd0418915f91a2b19abb80a441794f50bc567ed 100644 (file)
--- a/etc/afpd/afp_dsi.c
+++ b/etc/afpd/afp_dsi.c
@@ -46,7 +46,7 @@
 #include "dircache.h"
 
 #ifndef SOL_TCP
-#define SOL_TCP IPPROTO_TCPSOL_TCP
+#define SOL_TCP IPPROTO_TCP
 #endif
 
 /* 

diff --git a/etc/afpd/afp_mdns.c b/etc/afpd/afp_mdns.c
index 7c878d59bbc849b531e3e5dc983560567c446ec7..0e1635a63ce959e29aafdc2e25b0fd434491bbe1 100644 (file)
--- a/etc/afpd/afp_mdns.c
+++ b/etc/afpd/afp_mdns.c
@@ -229,8 +229,10 @@ static void register_stuff(const AFPObj *obj) {
         }
 
         if (obj->options.mimicmodel) {
+            LOG(log_info, logtype_afpd, "Registering server '%s' with model '%s'",
+                dsi->bonjourname, obj->options.mimicmodel);
             TXTRecordCreate(&txt_devinfo, 0, NULL);
-            TXTRecordPrintf(&txt_devinfo, "model", obj->options.mimicmodel);
+            TXTRecordPrintf(&txt_devinfo, "model=%s", obj->options.mimicmodel);
             error = DNSServiceRegister(&svc_refs[svc_ref_count++],
                                        0,               // no flags
                                        0,               // all network interfaces
@@ -238,7 +240,7 @@ static void register_stuff(const AFPObj *obj) {
                                        DEV_INFO_SERVICE_TYPE,
                                        "",            // default domains
                                        NULL,            // default host name
-                                       htons(port),
+                                       0,
                                        TXTRecordGetLength(&txt_devinfo),
                                        TXTRecordGetBytesPtr(&txt_devinfo),
                                        RegisterReply,           // callback