summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Estienne <sebastien.estienne@gmail.com>2005-11-01 18:06:18 +0000
committerSebastien Estienne <sebastien.estienne@gmail.com>2005-11-01 18:06:18 +0000
commitd217e7df3398c1bf0dd88ed28e9fb9c2f5f6f44f (patch)
treee56a761ea6425eda1c04562fa0e6fdffb77d55f0
parentca1b17ca51ec970419cf4178d7d83b7c47865f1b (diff)
* 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
-rw-r--r--avahi-core/server.c1
-rw-r--r--avahi-daemon/main.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/avahi-core/server.c b/avahi-core/server.c
index 0978385..3ec14a8 100644
--- 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 7508cf3..206334a 100644
--- 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);