Resolves: #243488

Summary: Use mozldap6 ldif_parse_line API
Changes:
1) Removed ldif.h from the DS tree.
2) Eliminated the 5-th arg of ldif_parse_line (errmsg) and the errmsg related
code.

1 files changed, 2 insertions, 22 deletions

diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c
index 0ae4b4fb..31e2cb08 100644
--- a/ldap/servers/slapd/entry.c
+++ b/ldap/servers/slapd/entry.c
@@ -203,27 +203,17 @@ str2entry_fast( char *s, int flags, int read_stateinfo )
 		int maxvals;
 		int del_maxvals;
 		char *type;
-		char *errmsg = NULL;
 
 		if ( *s == '\n' || *s == '\0' ) {
 			break;
 		}
 
-		if ( (retmalloc = ldif_parse_line( s, &type, &valuecharptr, &valuelen, &errmsg )) < 0 ) {
-			if ( errmsg != NULL ) {
-			         LDAPDebug( LDAP_DEBUG_PARSE, "%s", errmsg, 0, 0 );
-				 /* the memory below was not allocated by the slapi_ch_ functions */
-				 PR_smprintf_free(errmsg );
-			}
+		if ( (retmalloc = ldif_parse_line( s, &type, &valuecharptr, &valuelen )) < 0 ) {
 			LDAPDebug( LDAP_DEBUG_TRACE,
 			    "<= str2entry_fast NULL (parse_line)\n", 0, 0, 0 );
 			continue;
 		}
 
-		/* We don't use errmsg anywhere later. free it to avoid leaking... */
-		/* the memory below was not allocated by the slapi_ch_ functions */
-		slapi_ch_free( (void**)&errmsg );
-
 		/*
 		 * Extract the attribute and value CSNs from the attribute type.
 		 */		
@@ -581,7 +571,6 @@ str2entry_dupcheck( char *s, int flags, int read_stateinfo )
     int i, j;
     char *next=NULL;
     char *valuecharptr=NULL;
-    char *errmsg = NULL;
     int retmalloc = 0;
     int rc;
 	int fast_dup_check = 0;
@@ -617,21 +606,12 @@ str2entry_dupcheck( char *s, int flags, int read_stateinfo )
 		    break;
 		}
 
-		if ( (retmalloc = ldif_parse_line( s, &type, &valuecharptr, &valuelen, &errmsg )) < 0 ) {
-		    if ( errmsg != NULL ) {
-		             LDAPDebug( LDAP_DEBUG_PARSE, "%s", errmsg, 0, 0 );
-			     /* the memory below was not allocated by the slapi_ch_ functions */
-			     PR_smprintf_free(errmsg );
-		    }
+		if ( (retmalloc = ldif_parse_line( s, &type, &valuecharptr, &valuelen )) < 0 ) {
 		    LDAPDebug( LDAP_DEBUG_TRACE,
 			    "<= slapi_str2entry NULL (parse_line)\n", 0, 0, 0 );
 		    continue;
 		}
 
-		/* We don't use errmsg anywhere later. free it to avoid leaking... */
-		/* the memory below was not allocated by the slapi_ch_ functions */
-		slapi_ch_free( (void**)&errmsg );
-
 		/*
 		 * Extract the attribute and value CSNs from the attribute type.
 		 */