2084. [contrib] dbus update for 9.3.3rc2.

diff --git a/CHANGES b/CHANGES
index 75bf004f9b51f3f9f75fea1eeb640f6e89174087..90634071da1016e1ea888b2ced0b01c835df51c5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2084.  [contrib]       dbus update for 9.3.3rc2.
+
 2083.  [port]          win32: Visual C++ 2005 support.
 
 2082.  [doc]           Document 'cache-file' as a test only option.

diff --git a/contrib/dbus/Makefile b/contrib/dbus/Makefile
deleted file mode 100644 (file)
index 6285034..0000000
--- a/contrib/dbus/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# contrib/dbus/Makefile
-# 
-# This Makefile will install D-BUS support into the ISC BIND 9.3.2b1+ source,
-# necessary to support dynamic forwarding table management with D-BUS, for
-# Red Hat NetworkManager support.
-#
-# After running "make" in this directory, simply run make in the top level
-# BIND source directory, and D-BUS support will be enabled.
-#
-
-all:
-       echo 'Enabling D-BUS support...'
-       @ cp -fp dbus_mgr.c dbus_service.c ../../bin/named;
-       @ cp -fp dbus_mgr.h dbus_service.h ../../bin/named/include/named;
-       @ cp -fp README.DBUS ../../doc/misc
-       @ cd ../..; patch -s -p1 -b --suffix=.dbus < contrib/dbus/bind-9.3.2b1-dbus.patch
-
-install:
-       install -o root -g root -m 640 named-dbus-system.conf /etc/dbus-1/system.d/named.conf
-       install -o root -g root -m 640 named-dbus.service /usr/share/dbus-1/services/named.service

diff --git a/contrib/dbus/dbus_service.c b/contrib/dbus/dbus_service.c
index 85965d888793d2396f3f45e2e2123c18785eafc8..bb9dabaff6e2debb1643c9df3ccd507e95749485 100644 (file)
--- a/contrib/dbus/dbus_service.c
+++ b/contrib/dbus/dbus_service.c
@@ -1081,7 +1081,13 @@ dbus_svc_init
 
     switch
        (   dbus_bus_request_name 
-           (   connection, name, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT , &error
+           (   connection, name, 
+#ifdef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
+               DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT ,
+#else
+               0 ,
+#endif
+               &error
            ) 
        )
     {