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

diff --git a/CHANGES b/CHANGES
index f8c5cfb31167e97e359dae28b215c440ca58806d..646a43888b763c76de351ad16b8c873c609dfa2e 100644 (file)
--- 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 f53307d8e1439866bc4957c26e5579d50c6f1cfe..14d618f6f0c2ac9d00b27800263e0d3fa0b6b5c2 100644 (file)
--- 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,