From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 28 May 1999 00:19:15 +0000 (+0000)
Subject: Apply ITS#159 (null ldaphost) fix.
X-Git-Tag: OPENLDAP_REL_ENG_1_2_2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a704ad51ac4f4023f73d97e1f360f1458d0c8034;p=thirdparty%2Fopenldap.git

Apply ITS#159 (null ldaphost) fix.
---

diff --git a/CHANGES b/CHANGES
index 525c8b1d48..a69d782a32 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,13 +1,14 @@
 OpenLDAP Change Log
 
 Changes included in OpenLDAP 1.2 Release Engineering
-	CVS Tag: OPENLDAP_REL_ENG_1_2_1
+	CVS Tag: OPENLDAP_REL_ENG_1_2
 	Fixed ud cp == NULL bug (ITS#48)
 	Fixed ldbm Berkeley DB 2.4 mp_pool init problem (ITS#156)
 	Fixed slapd modrdn (ITS#78, #153)
 	Fixed slapd command line usage and log level option (ITS#145)
 	Fixed slapd acl group extended format parsing (ITS#123)
 	Fixed slurpd ldap_pvt_thread_create argument typo
+	Fixed ldapsearch null ldaphost bug (ITS#159)
 	Added modrdn test.
 	Updated slapd modify (and modrdn) attribute normalization bugs.
 	Build environment
diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index e3654c62e9..377d72dfe4 100644
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -266,7 +266,9 @@ char	**argv;
 #endif
 
     if ( verbose ) {
-	printf( "ldap_init( %s, %d )\n", ldaphost, ldapport );
+	printf( "ldap_init( %s, %d )\n",
+			(ldaphost != NULL) ? ldaphost : "<default>",
+			ldapport );
     }
 
     if (( ld = ldap_init( ldaphost, ldapport )) == NULL ) {