Updated for schemas.

[openldap] / servers / slapd / entry.c

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 460145378afc49998e0c3a9b07e7c7cfb4aa6531..dd9a95918eb4d7a7af4acf1ae2205c79e0f6309b 100644 (file)
--- 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 ) {