Apply ITS#159 (null ldaphost) fix.

diff --git a/CHANGES b/CHANGES
index 525c8b1d484ce042cd488b1b983e8c683d45fe10..a69d782a32b900605f891a1d55390073118cd67d 100644 (file)
--- 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 e3654c62e921036e0bc5bfd390d86ab7a69d732a..377d72dfe498fc18b25e09637511b36076321fea 100644 (file)
--- 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 ) {