4c80037896
(cherry picked from commitfa4807ec45) (cherry picked from commit323dbdee02) (cherry picked from commit7e532024f0)
67 lines
2.7 KiB
Diff
67 lines
2.7 KiB
Diff
From 7aac90a357211379c71b33b5c97fa3dde306d047 Mon Sep 17 00:00:00 2001
|
|
From: AmitKumar <amitkuma@redhat.com>
|
|
Date: Mon, 21 Aug 2017 19:59:59 +0530
|
|
Subject: [PATCH 36/93] ldap_child: Removing duplicate log message
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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
|
|
|
|
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
|
---
|
|
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 cfbfc5b7697332366f2a3f4813649a6dcba61b13..b796e5cae01517c85c2fc1605b1e5877454691dc 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 @@ done:
|
|
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);
|
|
--
|
|
2.14.1
|
|
|