>From 879ea2515047c53a49347cc402b4399aa82d9311 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Tue, 9 Oct 2012 19:02:05 +0200 Subject: [PATCH 1/2] Two fixes to child processes There was an unused structure member in the krb5_child. Declaration of __krb5_error_msg was shadowing the same variable from sss_krb5.h which is not nice. Also we might actually use the error context directly instead of passing it as parameter. --- src/providers/krb5/krb5_child.c | 2 -- src/providers/ldap/ldap_child.c | 9 +++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c index b2d5bdaeb9d4b1ac8de12055a4d6bb5a7f48a7f1..a30636bc1bfc5d70728685778cf86b8dc348c88b 100644 --- a/src/providers/krb5/krb5_child.c +++ b/src/providers/krb5/krb5_child.c @@ -69,8 +69,6 @@ struct krb5_child_ctx { char *ccache_dir; char *ccname_template; int auth_timeout; - - int child_debug_fd; }; struct krb5_req { diff --git a/src/providers/ldap/ldap_child.c b/src/providers/ldap/ldap_child.c index 888a1249f2a12870e8f5d9fa6bc570d875b28cb8..35e0c0f5ba8ece4953f9c6047d9c1850eb01e8ba 100644 --- a/src/providers/ldap/ldap_child.c +++ b/src/providers/ldap/ldap_child.c @@ -35,12 +35,13 @@ #include "providers/dp_backend.h" static krb5_context krb5_error_ctx; +#define LDAP_CHILD_DEBUG(level, error) KRB5_DEBUG(level, krb5_error_ctx, error) -static const char *__krb5_error_msg; +static const char *__ldap_child_krb5_error_msg; #define KRB5_SYSLOG(krb5_error) do { \ - __krb5_error_msg = sss_krb5_get_error_message(krb5_error_ctx, krb5_error); \ - sss_log(SSS_LOG_ERR, "%s", __krb5_error_msg); \ - sss_krb5_free_error_message(krb5_error_ctx, __krb5_error_msg); \ + __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 { -- 1.7.11.4