From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 3 Nov 1999 22:05:18 +0000 (+0000)
Subject: ITS#328: fix strstr bug (by commenting out bad code).  UD_BASE should
X-Git-Tag: OPENLDAP_REL_ENG_1_2_8~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b9392e52152ac86e0d16d4a82413a3b8cecc6b79;p=openldap

ITS#328: fix strstr bug (by commenting out bad code).  UD_BASE should
have been replaced with ldap.conf/ud.conf default handling, not NULL.
---

diff --git a/CHANGES b/CHANGES
index cb095c8600..3327b10515 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ Changes included in OpenLDAP 1.2 Release Engineering
 	Fixed ldbm db_appinit to use u_int32_t instead of int (ITS#295)
 	Fixed lber/io.c Cray T90 specific pointer arithmetic problem (ITS#325)
 	Fixed s_addr dereferencing (ITS#340)
+	Fixed ud strstr crash (ITS#328)
 	Added TCP_NODELAY support
 	Changed slapd to apply ACL to lastmod attributes
 	Changed slapd.conf default referral
diff --git a/clients/ud/util.c b/clients/ud/util.c
index 0ee2e60926..6edc032015 100644
--- a/clients/ud/util.c
+++ b/clients/ud/util.c
@@ -523,15 +523,19 @@ isadn( char *s )
 char *
 my_ldap_dn2ufn( char *s )
 {
+#ifdef UD_BASE
 	register char **cpp;
 	static char short_DN[BUFSIZ];
 
-	if (strstr(s, NULL) == NULL)
+	if (strstr(s, UD_BASE) == NULL)
 		return(ldap_dn2ufn(s));
 	cpp = ldap_explode_dn(s, TRUE);
 	sprintf(short_DN, "%s, %s", *cpp, *(cpp + 1));
 	ldap_value_free(cpp);
 	return(short_DN);
+#else
+	return(ldap_dn2ufn(s));
+#endif
 }
 
 /* return TRUE if this attribute should be printed as a URL */