summaryrefslogtreecommitdiffstats
path: root/server/sbus
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2009-09-22 13:11:29 -0400
committerSimo Sorce <ssorce@redhat.com>2009-09-23 07:33:31 -0400
commit87b8670b2749d02ffdc6c06506ac692b09db5be2 (patch)
treeead3f62f72c3522d3dc7703cd9f009aabc86a023 /server/sbus
parent091df02f920b5f5a658962d3add6f965d84375ac (diff)
downloadsssd-87b8670b2749d02ffdc6c06506ac692b09db5be2.tar.gz
sssd-87b8670b2749d02ffdc6c06506ac692b09db5be2.tar.xz
sssd-87b8670b2749d02ffdc6c06506ac692b09db5be2.zip
Revert "Use syslog for logging error conditions in SSSD"
This reverts commit 8c50bd085c0efe5fde354deee2c8118887aae29d. Amended: commit 1016af2b1b97ad4290ccce8fa462cc7e3c191b2e also made use of the SYSLOG_ERROR() macro, so those portions of that code also needed to be reverted.
Diffstat (limited to 'server/sbus')
-rw-r--r--server/sbus/sssd_dbus_common.c8
-rw-r--r--server/sbus/sssd_dbus_connection.c10
2 files changed, 9 insertions, 9 deletions
diff --git a/server/sbus/sssd_dbus_common.c b/server/sbus/sssd_dbus_common.c
index 8ec152152..e5970a3eb 100644
--- a/server/sbus/sssd_dbus_common.c
+++ b/server/sbus/sssd_dbus_common.c
@@ -130,7 +130,7 @@ dbus_bool_t sbus_add_watch(DBusWatch *dbus_watch, void *data)
/* does not exist, allocate new one */
watch = talloc_zero(conn, struct sbus_watch_ctx);
if (!watch) {
- SYSLOG_ERROR("Out of Memory!\n");
+ DEBUG(0, ("Out of Memory!\n"));
return FALSE;
}
watch->conn = conn;
@@ -170,7 +170,7 @@ dbus_bool_t sbus_add_watch(DBusWatch *dbus_watch, void *data)
watch, fd, event_flags,
sbus_watch_handler, watch);
if (!watch->fde) {
- SYSLOG_ERROR("Failed to set up fd event!\n");
+ DEBUG(0, ("Failed to set up fd event!\n"));
talloc_zfree(watch);
return FALSE;
}
@@ -323,7 +323,7 @@ dbus_bool_t sbus_add_timeout(DBusTimeout *dbus_timeout, void *data)
timeout = talloc_zero(conn, struct sbus_timeout_ctx);
if (!timeout) {
- SYSLOG_ERROR("Out of Memory!\n");
+ DEBUG(0, ("Out of Memory!\n"));
return FALSE;
}
timeout->dbus_timeout = dbus_timeout;
@@ -332,7 +332,7 @@ dbus_bool_t sbus_add_timeout(DBusTimeout *dbus_timeout, void *data)
timeout->te = tevent_add_timer(conn->ev, timeout, tv,
sbus_timeout_handler, timeout);
if (!timeout->te) {
- SYSLOG_ERROR("Failed to set up timeout event!\n");
+ DEBUG(0, ("Failed to set up timeout event!\n"));
return FALSE;
}
diff --git a/server/sbus/sssd_dbus_connection.c b/server/sbus/sssd_dbus_connection.c
index 907194f84..1953ee590 100644
--- a/server/sbus/sssd_dbus_connection.c
+++ b/server/sbus/sssd_dbus_connection.c
@@ -61,7 +61,7 @@ static void sbus_dispatch(struct tevent_context *ev,
/* Currently trying to reconnect, defer dispatch */
new_event = tevent_add_timer(ev, conn, tv, sbus_dispatch, conn);
if (new_event == NULL) {
- SYSLOG_ERROR("Could not defer dispatch!\n");
+ DEBUG(0,("Could not defer dispatch!\n"));
}
return;
}
@@ -75,7 +75,7 @@ static void sbus_dispatch(struct tevent_context *ev,
return;
}
- SYSLOG_ERROR("Cannot start auto-reconnection.\n");
+ DEBUG(0, ("Cannot start auto-reconnection.\n"));
conn->reconnect_callback(conn,
SBUS_RECONNECT_ERROR,
conn->reconnect_pvt);
@@ -483,7 +483,7 @@ int sbus_conn_add_interface(struct sbus_connection *conn,
path = intf->path;
if (path_in_interface_list(conn->intf_list, path)) {
- SYSLOG_ERROR("Cannot add method context with identical path.\n");
+ DEBUG(0, ("Cannot add method context with identical path.\n"));
return EINVAL;
}
@@ -499,7 +499,7 @@ int sbus_conn_add_interface(struct sbus_connection *conn,
dbret = dbus_connection_register_object_path(conn->dbus.conn,
path, &intf->vtable, intf_p);
if (!dbret) {
- SYSLOG_ERROR("Could not register object path to the connection.\n");
+ DEBUG(0, ("Could not register object path to the connection.\n"));
return ENOMEM;
}
@@ -580,7 +580,7 @@ static void sbus_reconnect(struct tevent_context *ev,
&iter->intf->vtable,
iter);
if (!dbret) {
- SYSLOG_ERROR("Could not register object path.\n");
+ DEBUG(0, ("Could not register object path.\n"));
dbus_connection_unref(conn->dbus.conn);
goto failed;
}