From acbd79be7e83ba93d01d0ad24a1324e3f6fe5f0c Mon Sep 17 00:00:00 2001
From: Bryan Clark <clarkbw@cvs.gnome.org>
Date: Tue, 28 Sep 2004 16:13:56 +0000
Subject: [PATCH] 2004-09-28  Bryan Clark  <clarkbw@cvs.gnome.org>

        Changes from J5

        * info-daemon/NetworkManagerInfo.conf: fixed own permissions

        * info-daemon/NetworkManagerInfoDbus.c: added service name to
        syslog output


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@176 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
---
 ChangeLog                            | 9 +++++++++
 info-daemon/NetworkManagerInfo.conf  | 4 ++--
 info-daemon/NetworkManagerInfoDbus.c | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 06a3af3ae..117f42950 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-28  Bryan Clark  <clarkbw@cvs.gnome.org>
+
+	Changes from J5
+	
+	* info-daemon/NetworkManagerInfo.conf: fixed own permissions
+
+	* info-daemon/NetworkManagerInfoDbus.c: added service name to
+	syslog output
+
 Wed Sep 22 14:19:48 2004  Jonathan Blandford  <jrb@redhat.com>
 
 	* panel-applet/NMWirelessApplet.c: Only add essid's if we actually
diff --git a/info-daemon/NetworkManagerInfo.conf b/info-daemon/NetworkManagerInfo.conf
index bf60884fd..61acff9ed 100644
--- a/info-daemon/NetworkManagerInfo.conf
+++ b/info-daemon/NetworkManagerInfo.conf
@@ -3,12 +3,12 @@
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
 	<policy user="root">
-		<allow own="org.freedesktop.NetworkManagerInfo"/>
-
 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
 	</policy>
 	<policy at_console="true">
+		<allow own="org.freedesktop.NetworkManagerInfo"/>
+
 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
 	</policy>
diff --git a/info-daemon/NetworkManagerInfoDbus.c b/info-daemon/NetworkManagerInfoDbus.c
index a9ab7e624..dbe6444d7 100644
--- a/info-daemon/NetworkManagerInfoDbus.c
+++ b/info-daemon/NetworkManagerInfoDbus.c
@@ -586,7 +586,7 @@ int nmi_dbus_service_init (DBusConnection *dbus_connection, NMIAppInfo *info)
 	dbus_bus_acquire_service (dbus_connection, NMI_DBUS_SERVICE, 0, &dbus_error);
 	if (dbus_error_is_set (&dbus_error))
 	{
-		syslog (LOG_ERR, "nmi_dbus_service_init() could not acquire its service.  dbus_bus_acquire_service() says: '%s'", dbus_error.message);
+		syslog (LOG_ERR, "nmi_dbus_service_init() could not acquire service %s.  dbus_bus_acquire_service() says: '%s'", NMI_DBUS_SERVICE, dbus_error.message);
 		dbus_error_free (&dbus_error);
 		return (-1);
 	}