X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fentry.c;h=dd9a95918eb4d7a7af4acf1ae2205c79e0f6309b;hb=a5ee438c9394a19a241716d3d922299c20b0365d;hp=460145378afc49998e0c3a9b07e7c7cfb4aa6531;hpb=52cf422c1be6def42d8c6cf71114502ae51eea32;p=openldap

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 460145378a..dd9a95918e 100644
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -41,7 +41,7 @@ str2entry( char *s )
 	struct berval	*vals[2];
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
 	AttributeDescription *ad;
-	char *text;
+	const char *text;
 #else
 	int		nvals = 0;
 	int		maxvals = 0;
@@ -110,8 +110,8 @@ str2entry( char *s )
 			maxvals = 0;
 			a = NULL;
 		}
-#endif
 
+#endif
 		if ( strcasecmp( type, "dn" ) == 0 ) {
 			free( type );
 
@@ -145,7 +145,7 @@ str2entry( char *s )
 
 		ad_free( ad, 1 );
 #else
-		rc = attr_merge_fast( e, type, vals, nvals, 1, &maxvals, &a )
+		rc = attr_merge_fast( e, type, vals, nvals, 1, &maxvals, &a );
 #endif
 
 		if( rc != 0 ) {