[SSSD] [PATCH] Prevent printing NULL in several places of LDAP provider
Jakub Hrozek
jhrozek at redhat.com
Mon Nov 7 13:35:20 UTC 2011
I've seen several "(null)"s being printed when I was testing the IPA
password migrations. The attached patch sanitizes them.
-------------- next part --------------
From 0ac47e979af1f6db58aaac345bbcbcc8c31e65a9 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Mon, 7 Nov 2011 13:51:44 +0100
Subject: [PATCH] Prevent printing NULL in several places of LDAP provider
---
src/providers/ldap/sdap_async.c | 6 ++++--
src/providers/ldap/sdap_async_connection.c | 8 +++++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c
index 384ff8ef6a7612c81e0c5edf9814ecad4f3dfa30..a1355f93eb56553ed23abe1a1c8008db815b9334 100644
--- a/src/providers/ldap/sdap_async.c
+++ b/src/providers/ldap/sdap_async.c
@@ -1110,11 +1110,13 @@ static void sdap_get_generic_ext_done(struct sdap_op *op,
}
DEBUG(6, ("Search result: %s(%d), %s\n",
- sss_ldap_err2string(result), result, errmsg));
+ sss_ldap_err2string(result), result,
+ errmsg ? errmsg : "no errmsg set"));
if (result != LDAP_SUCCESS && result != LDAP_NO_SUCH_OBJECT) {
DEBUG(2, ("Unexpected result from ldap: %s(%d), %s\n",
- sss_ldap_err2string(result), result, errmsg));
+ sss_ldap_err2string(result), result,
+ errmsg ? errmsg : "no errmsg set"));
}
ldap_memfree(errmsg);
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
index 614e2fda81de25c7a03016a74d88aa2117288b87..de50d69b03bff7e806992417c40bd3b650a247b1 100644
--- a/src/providers/ldap/sdap_async_connection.c
+++ b/src/providers/ldap/sdap_async_connection.c
@@ -588,7 +588,8 @@ static void simple_bind_done(struct sdap_op *op,
}
DEBUG(3, ("Bind result: %s(%d), %s\n",
- sss_ldap_err2string(state->result), state->result, errmsg));
+ sss_ldap_err2string(state->result), state->result,
+ errmsg ? errmsg : "no errmsg set"));
ret = LDAP_SUCCESS;
done:
@@ -792,8 +793,9 @@ struct tevent_req *sdap_kinit_send(TALLOC_CTX *memctx,
struct sdap_kinit_state *state;
int ret;
- DEBUG(6, ("Attempting kinit (%s, %s, %s, %d)\n", keytab, principal, realm,
- lifetime));
+ DEBUG(6, ("Attempting kinit (%s, %s, %s, %d)\n",
+ keytab ? keytab : "default",
+ principal, realm, lifetime));
if (lifetime < 0 || lifetime > INT32_MAX) {
DEBUG(1, ("Ticket lifetime out of range.\n"));
--
1.7.7
More information about the sssd-devel
mailing list