From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 2 Feb 2006 21:01:29 +0000 (+0000)
Subject: format error message as LDIF (do not assume the error messages do not contain fancy... 
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~239
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9fd59d812d6400695e39a369ca007bdc3a9749e0;p=openldap

format error message as LDIF (do not assume the error messages do not contain fancy chars; ITS#4382)
---

diff --git a/servers/slurpd/reject.c b/servers/slurpd/reject.c
index fd5e8bd447..4f49f6a4e0 100644
--- a/servers/slurpd/reject.c
+++ b/servers/slurpd/reject.c
@@ -39,6 +39,7 @@
 #include <stdio.h>
 
 #include <ac/stdlib.h>
+#include <ac/string.h>
 #include <ac/errno.h>
 #include <ac/unistd.h>
 
@@ -48,6 +49,9 @@
 #include "slurp.h"
 #include "globals.h"
 
+#include "lber_pvt.h"
+#include "lutil.h"
+
 #ifdef _WIN32
 #define	PORTSEP	","
 #else
@@ -96,12 +100,45 @@ write_reject(
 	Debug( LDAP_DEBUG_ANY, "Error: cannot open reject file \"%s\"\n",
 		rejfile, 0, 0 );
     } else {
-	fseek( rfp, 0, 2 );
-	fprintf( rfp, "%s: %s", ERROR_STR, ldap_err2string( lderr ));
+	struct berval	bv = BER_BVNULL,
+			errstrbv,
+			errmsgbv = BER_BVNULL;
+	char		*ptr;
+
+	ber_str2bv( ldap_err2string( lderr ), 0, 0, &errstrbv );
 	if ( errmsg && *errmsg ) {
-	    fprintf( rfp, ": %s", errmsg );
+		ber_str2bv( errmsg, 0, 0, &errmsgbv );
+		bv.bv_len = errstrbv.bv_len
+			+ STRLENOF( ": " ) + errmsgbv.bv_len;
+
+		ptr = bv.bv_val = ber_memalloc( bv.bv_len + 1 );
+		ptr = lutil_strcopy( ptr, errstrbv.bv_val );
+		ptr = lutil_strcopy( ptr, ": " );
+		ptr = lutil_strcopy( ptr, errmsgbv.bv_val );
+
+	} else {
+		bv = errstrbv;
 	}
-	fprintf( rfp, "\n" );
+
+	fseek( rfp, 0, 2 );
+
+	ptr = ldif_put( LDIF_PUT_VALUE, ERROR_STR, bv.bv_val, bv.bv_len );
+	if ( bv.bv_val != errstrbv.bv_val ) {
+		ber_memfree( bv.bv_val );
+	}
+	if ( ptr == NULL ) {
+		Debug( LDAP_DEBUG_ANY,
+			"Error: cannot convert error message(s) \"%s%s%s\" "
+			"into LDIF format\n",
+			errstrbv.bv_val,
+			BER_BVISNULL( &errmsgbv ) ? "" : ": ",
+			BER_BVISNULL( &errmsgbv ) ? "" : errmsgbv.bv_val );
+		return;
+	}
+
+	fputs( ptr, rfp );
+	ber_memfree( ptr );
+
 	if ((rc = re->re_write( ri, re, rfp )) < 0 ) {
 	    Debug( LDAP_DEBUG_ANY,
 		    "Error: cannot write reject file \"%s\"\n",