From: Trent Lloyd <lathiat@bur.st>
Date: Mon, 11 Dec 2006 22:35:04 +0000 (+0000)
Subject:  * Fix specifying priviliged access group (Closes: #85)
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=fb09d84111eaa48462cf49879547f815dd0f08f6;p=catta

 * Fix specifying priviliged access group (Closes: #85)
   Thanks to delphinidae
 * Fix incorrect manual reference (Closes: #83)
   Thanks to delphinidae
 * Fix incorrect assert() in client-publish-service.c (Closes: #79)
   Thanks to tedp
 * Fix builds on < 2.6.19 (temporary fix, pending possible "better" solution)


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1337 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---

diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c
index a975976..91fac65 100644
--- a/avahi-core/iface-linux.c
+++ b/avahi-core/iface-linux.c
@@ -30,12 +30,13 @@
 
 #include <avahi-common/malloc.h>
 
-#include <linux/if_addr.h>
 #ifndef IFLA_RTA
+#include <linux/if_addr.h>
 #define IFLA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
 #endif
 
 #ifndef IFA_RTA
+#include <linux/if_addr.h>
 #define IFA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
 #endif
 
diff --git a/configure.ac b/configure.ac
index fe26066..f2dd5f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -715,10 +715,10 @@ AC_SUBST(AVAHI_GROUP)
 AC_DEFINE_UNQUOTED(AVAHI_GROUP,"$AVAHI_GROUP", [Group for Avahi])
 
 AC_ARG_WITH(avahi_priv_access_group,AS_HELP_STRING([--with-avahi-priv-access-group=<group>],[Priviliged access group for Avahi clients (netdev)]))
-if test -z "$with_priv_access_group" ; then
+if test -z "$with_avahi_priv_access_group" ; then
     AVAHI_PRIV_ACCESS_GROUP=netdev
 else
-    AVAHI_PRIV_ACCESS_GROUP=$with_priv_access_group
+    AVAHI_PRIV_ACCESS_GROUP=$with_avahi_priv_access_group
 fi
 AC_SUBST(AVAHI_PRIV_ACCESS_GROUP)
 AC_DEFINE_UNQUOTED(AVAHI_PRIV_ACCESS_GROUP,"$AVAHI_PRIV_ACCESS_GROUP", [Privileged access group for Avahi clients])
diff --git a/examples/client-publish-service.c b/examples/client-publish-service.c
index 66a59de..94dcd1e 100644
--- a/examples/client-publish-service.c
+++ b/examples/client-publish-service.c
@@ -44,7 +44,7 @@ static char *name = NULL;
 static void create_services(AvahiClient *c);
 
 static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata) {
-    assert(g == group);
+    assert(g == group || group == NULL);
 
     /* Called whenever the entry group state changes */
 
diff --git a/man/avahi-dnsconfd.8.xml.in b/man/avahi-dnsconfd.8.xml.in
index 454afac..c74e1ba 100644
--- a/man/avahi-dnsconfd.8.xml.in
+++ b/man/avahi-dnsconfd.8.xml.in
@@ -92,7 +92,7 @@
 	
 	<section name="See also">
 	  <p>
-        <manref name="avahi-daemon" section="8"/>, <manref name="dnsconfd.action" section="8"/>
+        <manref name="avahi-daemon" section="8"/>, <manref name="avahi-dnsconfd.action" section="8"/>
 	  </p>
 	</section>