From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 23 Jan 2007 01:34:13 +0000 (+0000)
Subject: make Solaris happy with printf of NULLs (ITS#4811?)
X-Git-Tag: OPENLDAP_REL_ENG_2_3_34~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a6fe2535ce4311842a2e15076926f186dd93fb2;p=thirdparty%2Fopenldap.git

make Solaris happy with printf of NULLs (ITS#4811?)
---

diff --git a/CHANGES b/CHANGES
index f8c5cfb311..646a43888b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.34 Engineering
 	Fixed slapd-ldap C-API code tests (ITS#4808)
+	Fixed slapd-monitor NULL printf (ITS#4811)
 
 OpenLDAP 2.3.33 Release (2007/01/17)
 	Fixed slapd syncrepl error logging with delta-syncrepl
diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c
index f53307d8e1..14d618f6f0 100644
--- a/servers/slapd/back-monitor/conn.c
+++ b/servers/slapd/back-monitor/conn.c
@@ -401,8 +401,10 @@ conn_create(
 			c->c_dn.bv_len ? c->c_dn.bv_val : SLAPD_ANONYMOUS,
 			
 			c->c_listener_url.bv_val,
-			c->c_peer_domain.bv_val,
-			c->c_peer_name.bv_val,
+			BER_BVISNULL( &c->c_peer_domain )
+				? "" : c->c_peer_domain.bv_val,
+			BER_BVISNULL( &c->c_peer_name )
+				? "" : c->c_peer_name.bv_val,
 			c->c_sock_name.bv_val,
 			
 			buf2,