diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-06-22 14:44:40 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2007-06-22 14:44:40 +0000 |
| commit | f235c3b3a35bd6cd0d2eeb3f1ee35ad3268788a2 (patch) | |
| tree | 95e8c7cfe8a5d0d00271a0e2413e5c41bb460593 | |
| parent | 908e17b09610cfbee3927d563b3ed3b88f7569a5 (diff) | |
| download | NetworkManager-f235c3b3a35bd6cd0d2eeb3f1ee35ad3268788a2.tar.gz | |
2007-06-22 Dan Williams <dcbw@redhat.com>
* callouts/nm-avahi-autoipd.action
callouts/nm-avahi-autoipd.conf
src/NetworkManagerDbus.c
- org.freedesktop.NetworkManager.avahiautoipd -> org.freedesktop.nm_avahi_autoipd
Must have a different bus name than NetworkManager, otherwise the
security policies conflict.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/branches/nm-0-6-olpc@2614 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | callouts/nm-avahi-autoipd.action | 2 | ||||
| -rw-r--r-- | callouts/nm-avahi-autoipd.conf | 8 | ||||
| -rw-r--r-- | src/NetworkManagerDbus.c | 2 |
4 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,12 @@ +2007-06-22 Dan Williams <dcbw@redhat.com> + + * callouts/nm-avahi-autoipd.action + callouts/nm-avahi-autoipd.conf + src/NetworkManagerDbus.c + - org.freedesktop.NetworkManager.avahiautoipd -> org.freedesktop.nm_avahi_autoipd + Must have a different bus name than NetworkManager, otherwise the + security policies conflict. + 2007-06-21 Dan Williams <dcbw@redhat.com> Big mesh update diff --git a/callouts/nm-avahi-autoipd.action b/callouts/nm-avahi-autoipd.action index 1b2f709df8..56c69e3a97 100644 --- a/callouts/nm-avahi-autoipd.action +++ b/callouts/nm-avahi-autoipd.action @@ -15,7 +15,7 @@ set -e --system \ --type=signal \ / \ - org.freedesktop.NetworkManager.avahiautoipd.AutoIP4Event \ + org.freedesktop.nm_avahi_autoipd.AutoIP4Event \ 'string:'"$1" \ 'string:'"$2" \ 'string:'"$3"; diff --git a/callouts/nm-avahi-autoipd.conf b/callouts/nm-avahi-autoipd.conf index 780883b766..e5710ae686 100644 --- a/callouts/nm-avahi-autoipd.conf +++ b/callouts/nm-avahi-autoipd.conf @@ -3,12 +3,12 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <busconfig> <policy user="root"> - <allow own="org.freedesktop.NetworkManager.avahiautoipd"/> - <allow send_interface="org.freedesktop.NetworkManager.avahiautoipd"/> + <allow own="org.freedesktop.nm_avahi_autoipd"/> + <allow send_interface="org.freedesktop.nm_avahi_autoipd"/> </policy> <policy context="default"> - <deny own="org.freedesktop.NetworkManager.avahiautoipd"/> - <deny send_interface="org.freedesktop.NetworkManager.avahiautoipd"/> + <deny own="org.freedesktop.nm_avahi_autoipd"/> + <deny send_interface="org.freedesktop.nm_avahi_autoipd"/> </policy> </busconfig> diff --git a/src/NetworkManagerDbus.c b/src/NetworkManagerDbus.c index 24ac04bf10..43e419b16a 100644 --- a/src/NetworkManagerDbus.c +++ b/src/NetworkManagerDbus.c @@ -541,7 +541,7 @@ out: g_free (dev_path); } -#define AUTOIPD_CALLOUT_INTERFACE "org.freedesktop.NetworkManager.avahiautoipd" +#define AUTOIPD_CALLOUT_INTERFACE "org.freedesktop.nm_avahi_autoipd" static gboolean nm_dbus_autoip_process_signal (NMData * data, DBusMessage * message) |