* fix compiling with --disable-dbus

* add a missing include for OpenBSD

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

diff --git a/avahi-core/server.c b/avahi-core/server.c
index 0978385948e9790908b900d51fde783019d02089..3ec14a8f8a06b170c8d910ae88c26c1142566287 100644 (file)
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif
 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <string.h>

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 7508cf39f8324a40de87f36eb63e5869d216c704..206334abfbe5539d2a7585249c34b74d4658a93a 100644 (file)
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -467,6 +467,7 @@ static int load_config_file(DaemonConfig *c) {
                     c->server_config.use_iff_running = is_yes(p->value);
                 else if (strcasecmp(p->key, "disallow-other-stacks") == 0)
                     c->server_config.disallow_other_stacks = is_yes(p->value);
+#ifdef HAVE_DBUS
                 else if (strcasecmp(p->key, "enable-dbus") == 0) {
 
                     if (*(p->value) == 'w' || *(p->value) == 'W') {
@@ -478,7 +479,9 @@ static int load_config_file(DaemonConfig *c) {
                     } else {
                         c->enable_dbus = 0;
                     }
-                } else if (strcasecmp(p->key, "drop-root") == 0)
+                }
+#endif
+               else if (strcasecmp(p->key, "drop-root") == 0)
                     c->drop_root = is_yes(p->value);
                 else if (strcasecmp(p->key, "add-service-cookie") == 0)
                     c->server_config.add_service_cookie = is_yes(p->value);