diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-14 13:35:50 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-14 13:35:50 -0500 |
| commit | 1603130236c55ddabc3854d4ba62d544debcf1f5 (patch) | |
| tree | 02b1cffad943cb69c2b79118b0ab9a758b9e0f1a /config | |
| parent | f207e69d62bc04c7f254347b03e6d8fa8b569d66 (diff) | |
| parent | f7dd0c72b8f861f4d5443a43d1013e3fe3db43ca (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/xace.c
Xext/xace.h
Diffstat (limited to 'config')
| -rw-r--r-- | config/dbus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/dbus.c b/config/dbus.c index e564c90fc..f6ac4c11c 100644 --- a/config/dbus.c +++ b/config/dbus.c @@ -355,8 +355,8 @@ connect_hook(DBusConnection *connection, void *data) dbus_error_init(&error); - if (!dbus_bus_request_name(info->connection, info->busname, - 0, &error)) { + dbus_bus_request_name(info->connection, info->busname, 0, &error); + if (dbus_error_is_set(&error)) { ErrorF("[config/dbus] couldn't take over org.x.config: %s (%s)\n", error.name, error.message); goto err_start; |