From 90cf33953dcfab988162f9ee53cdc0eb6ff87c28 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 18 Jun 2005 09:01:51 +0000
Subject: r7715: ensure we don't print null strings in ldap_errstr() (This used
 to be commit dc419fc89973c2d7fa333df389b75cb218e8a848)

---
 source4/libcli/ldap/ldap_client.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4/libcli/ldap')

diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 7ad45f4eea..e392002a19 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -549,7 +549,9 @@ NTSTATUS ldap_check_response(struct ldap_connection *conn, struct ldap_Result *r
 	}
 	conn->last_error = talloc_asprintf(conn, "LDAP error %u - %s <%s> <%s>", 
 					   r->resultcode,
-					   r->dn, r->errormessage, r->referral);
+					   r->dn?r->dn:"(NULL)", 
+					   r->errormessage?r->errormessage:"", 
+					   r->referral?r->referral:"");
 	
 	return NT_STATUS_LDAP(r->resultcode);
 }
-- 
cgit