svn commit: samba r7715 - in branches/SAMBA_4_0/source/libcli/ldap: .

[tridge at samba.org]

Author: tridge
Date: 2005-06-18 09:01:51 +0000 (Sat, 18 Jun 2005)
New Revision: 7715

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7715

Log:
ensure we don't print null strings in ldap_errstr()


Modified:
   branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c	2005-06-18 09:01:09 UTC (rev 7714)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c	2005-06-18 09:01:51 UTC (rev 7715)
@@ -549,7 +549,9 @@
 	}
 	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);
 }