Merge commit 'origin/master-tx'

diff --git a/avahi-core/server.c b/avahi-core/server.c
index 73ae1cb17c074817c6f2104399d89b7beabaea3e..bb625a577ca123e4fb90a771400425d9e0065785 100644 (file)
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -844,7 +844,7 @@ static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const Ava
         if (getsockname(s->fd_legacy_unicast_ipv4, (struct sockaddr*) &lsa, &l) != 0)
             avahi_log_warn("getsockname(): %s", strerror(errno));
         else
-            return lsa.sin_port == port;
+            return avahi_port_from_sockaddr((struct sockaddr*) &lsa) == port;
 
     }
 
@@ -855,7 +855,7 @@ static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const Ava
         if (getsockname(s->fd_legacy_unicast_ipv6, (struct sockaddr*) &lsa, &l) != 0)
             avahi_log_warn("getsockname(): %s", strerror(errno));
         else
-            return lsa.sin6_port == port;
+            return avahi_port_from_sockaddr((struct sockaddr*) &lsa) == port;
     }
 
     return 0;

diff --git a/avahi-daemon/avahi-dbus.conf.in b/avahi-daemon/avahi-dbus.conf.in
index e439e0794bfffbab8ab7470a5de7d164a932c34a..9d2118167b1c9674627dae026b442af3e564f1c1 100644 (file)
--- a/avahi-daemon/avahi-dbus.conf.in
+++ b/avahi-daemon/avahi-dbus.conf.in
@@ -1,6 +1,6 @@
 <!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+          "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+          "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
 
   <!-- Only root or user @AVAHI_USER@ can own the Avahi service -->
@@ -16,7 +16,8 @@
     <allow send_destination="org.freedesktop.Avahi"/>
     <allow receive_sender="org.freedesktop.Avahi"/>
 
-    <deny send_interface="org.freedesktop.Avahi.Server" send_member="SetHostName"/>
+    <deny send_destination="org.freedesktop.Avahi"
+          send_interface="org.freedesktop.Avahi.Server" send_member="SetHostName"/>
   </policy>
 
   <!-- Allow everything, including access to SetHostName to users of the group "@AVAHI_PRIV_ACCESS_GROUP@" -->

diff --git a/avahi-daemon/caps.c b/avahi-daemon/caps.c
index 3c9f50f48be87051c57c002ba405abe7e9a97711..fbb9d7a84c5453f43ee3d87c1a7302d73e1717b1 100644 (file)
--- a/avahi-daemon/caps.c
+++ b/avahi-daemon/caps.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif
 
+#include <sys/types.h>
 #include <assert.h>
 #include <errno.h>
 #include <string.h>