URL: https://github.com/SSSD/sssd/pull/352 Author: amitkumar50 Title: #352: logging: Removing duplicate log message Action: synchronized
To pull the PR as Git branch: git remote add ghsssd https://github.com/SSSD/sssd git fetch ghsssd pull/352/head:pr352 git checkout pr352
From 1e7afe84a9871a26986cb1170fb13da5a4dbca73 Mon Sep 17 00:00:00 2001 From: AmitKumar <amitk...@redhat.com> Date: Mon, 21 Aug 2017 19:59:59 +0530 Subject: [PATCH] logging: Removing duplicate log message Duplicate log messages were getting logged if trust relationship breaks for some reason from AD. That causes lot spam in syslog. This PR removes duplicate log entry and keeps extended log entry. Resolves: https://pagure.io/SSSD/sssd/issue/3450 --- src/providers/ldap/ldap_child.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/providers/ldap/ldap_child.c b/src/providers/ldap/ldap_child.c index cfbfc5b76..b796e5cae 100644 --- a/src/providers/ldap/ldap_child.c +++ b/src/providers/ldap/ldap_child.c @@ -61,13 +61,6 @@ static void sig_term_handler(int sig) static krb5_context krb5_error_ctx; #define LDAP_CHILD_DEBUG(level, error) KRB5_DEBUG(level, krb5_error_ctx, error) -static const char *__ldap_child_krb5_error_msg; -#define KRB5_SYSLOG(krb5_error) do { \ - __ldap_child_krb5_error_msg = sss_krb5_get_error_message(krb5_error_ctx, krb5_error); \ - sss_log(SSS_LOG_ERR, "%s", __ldap_child_krb5_error_msg); \ - sss_krb5_free_error_message(krb5_error_ctx, __ldap_child_krb5_error_msg); \ -} while(0) - struct input_buffer { const char *realm_str; const char *princ_str; @@ -450,11 +443,6 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, DEBUG(SSSDBG_FATAL_FAILURE, "Failed to init credentials: %s\n", sss_krb5_get_error_message(context, krberr)); - sss_log(SSS_LOG_ERR, - "Failed to initialize credentials using keytab [%s]: %s. " - "Unable to create GSSAPI-encrypted LDAP connection.", - KEYTAB_CLEAN_NAME, - sss_krb5_get_error_message(context, krberr)); goto done; } DEBUG(SSSDBG_TRACE_INTERNAL, "credentials initialized\n"); @@ -527,7 +515,11 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, if (krberr != 0) { const char *krb5_msg; - KRB5_SYSLOG(krberr); + sss_log(SSS_LOG_ERR, + "Failed to initialize credentials using keytab [%s]: %s. " + "Unable to create GSSAPI-encrypted LDAP connection.", + KEYTAB_CLEAN_NAME, + sss_krb5_get_error_message(context, krberr)); krb5_msg = sss_krb5_get_error_message(context, krberr); *_krb5_msg = talloc_strdup(memctx, krb5_msg); sss_krb5_free_error_message(context, krb5_msg);
_______________________________________________ sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org
