From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 15 May 2002 20:55:43 +0000 (+0000)
Subject: From: h.b.furuseth@usit.uio.no
X-Git-Tag: OPENLDAP_REL_ENG_2_MP~57
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=54d93cc003a19d18d337c3bd26a146c4152998df;p=openldap

From: h.b.furuseth@usit.uio.no
Subject: Patch: str2entry() dereferences NULL  (ITS#1822)

entry.c:str2entry() prints pdn->bv_val even though pdn is always
NULL.  pdn was pretty dn before version 1.80.
---

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 48afbf5d9d..b30598fab3 100644
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -109,8 +109,6 @@ str2entry( char *s )
 		}
 
 		if ( strcasecmp( type, "dn" ) == 0 ) {
-			struct berval *pdn = NULL;
-
 			free( type );
 
 			if ( e->e_dn != NULL ) {
@@ -137,12 +135,12 @@ str2entry( char *s )
 				LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, "str2entry: "
 					"entry %ld has invalid DN \"%s\"\n",
 					(long) e->e_id,
-					pdn->bv_val ? pdn->bv_val : "" ));
+					e->e_dn ? e->e_dn : "" ));
 #else
 				Debug( LDAP_DEBUG_ANY, "str2entry: "
 					"entry %ld has invalid DN \"%s\"\n",
 					(long) e->e_id,
-					pdn->bv_val ? pdn->bv_val : "", 0 );
+					e->e_dn ? e->e_dn : "", 0 );
 #endif
 				entry_free( e );
 				return NULL;