diff options
author | Stephen Gallagher <sgallagh@redhat.com> | 2009-09-22 13:11:29 -0400 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2009-09-23 07:33:31 -0400 |
commit | 87b8670b2749d02ffdc6c06506ac692b09db5be2 (patch) | |
tree | ead3f62f72c3522d3dc7703cd9f009aabc86a023 /server/responder/pam/pamsrv.c | |
parent | 091df02f920b5f5a658962d3add6f965d84375ac (diff) | |
download | sssd-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/responder/pam/pamsrv.c')
-rw-r--r-- | server/responder/pam/pamsrv.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/server/responder/pam/pamsrv.c b/server/responder/pam/pamsrv.c index 4e0bf83e5..c751528f7 100644 --- a/server/responder/pam/pamsrv.c +++ b/server/responder/pam/pamsrv.c @@ -48,8 +48,6 @@ #define PAM_SBUS_SERVICE_NAME "pam" #define PAM_SRV_CONFIG "config/services/pam" -#define PRG_NAME "sssd[pam]" - static int service_reload(DBusMessage *message, struct sbus_connection *conn); struct sbus_method monitor_pam_methods[] = { @@ -119,7 +117,7 @@ static void pam_dp_reconnect_init(struct sbus_connection *conn, int status, void } /* Handle failure */ - SYSLOG_ERROR("Could not reconnect to data provider.\n"); + DEBUG(0, ("Could not reconnect to data provider.\n")); /* Kill the backend and let the monitor restart it */ pam_shutdown(rctx); } @@ -157,7 +155,7 @@ static int pam_process_init(TALLOC_CTX *mem_ctx, ret = confdb_get_int(rctx->cdb, rctx, SERVICE_CONF_ENTRY, "reconnection_retries", 3, &max_retries); if (ret != EOK) { - SYSLOG_ERROR("Failed to set up automatic reconnection\n"); + DEBUG(0, ("Failed to set up automatic reconnection\n")); return ret; } @@ -193,11 +191,8 @@ int main(int argc, const char *argv[]) poptFreeContext(pc); - /* enable syslog logging */ - openlog(PRG_NAME, LOG_PID, LOG_DAEMON); - /* set up things like debug , signals, daemonization, etc... */ - ret = server_setup(PRG_NAME, 0, PAM_SRV_CONFIG, &main_ctx); + ret = server_setup("sssd[pam]", 0, PAM_SRV_CONFIG, &main_ctx); if (ret != EOK) return 2; ret = die_if_parent_died(); @@ -214,9 +209,6 @@ int main(int argc, const char *argv[]) /* loop on main */ server_loop(main_ctx); - /* close syslog */ - closelog(); - return 0; } |