Improve schema error messages

[openldap] / servers / slapd / back-meta / config.c

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index 3b550beb420b41aa834e92911bdb48d0cb5bbfaa..107ac5cadb9cc1c350fd99aa8f8527c8ec90e573 100644 (file)
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -75,13 +75,6 @@
 #include "../back-ldap/back-ldap.h"
 #include "back-meta.h"
 
-extern int
-suffix_massage_config(
-               struct rewrite_info *info,
-               int argc,
-               char **argv
-);
-
 static struct metatarget *
 new_target( void )
 {
@@ -235,8 +228,8 @@ meta_back_db_config(
                 * or worked out, at least, in some manner
                 */
                for ( j = 0; j < i-1; j++ ) {
-                       if ( strcmp( li->targets[ i ]->suffix.bv_val,
-                                       li->targets[ j ]->suffix.bv_val ) == 0 ) {
+                       if ( dn_match( &li->targets[ i ]->suffix,
+                                       &li->targets[ j ]->suffix ) ) {
                                fprintf( stderr,
        "%s: line %d: naming context \"%s\" already used"
        " in \"uri <protocol>://<server>[:port]/<naming context>\" line\n",
@@ -399,7 +392,7 @@ meta_back_db_config(
        } else if ( strcasecmp( argv[ 0 ], "suffixmassage" ) == 0 ) {
                BackendDB       *tmp_be;
                int             i = li->ntargets-1;
-               struct berval   dn, ndn;
+               struct berval   dn, nvnc, pvnc, nrnc, prnc;
 
                if ( i < 0 ) {
                        fprintf( stderr,
@@ -428,41 +421,49 @@ meta_back_db_config(
 
                dn.bv_val = argv[ 1 ];
                dn.bv_len = strlen( argv[ 1 ] );
-               if ( dnNormalize2( NULL, &dn, &ndn ) != LDAP_SUCCESS ) {
+               if ( dnPrettyNormal( NULL, &dn, &pvnc, &nvnc ) != LDAP_SUCCESS ) {
                        fprintf( stderr, "%s: line %d: "
                                        "suffix '%s' is invalid\n",
                                        fname, lineno, argv[ 1 ] );
                        return 1;
                }
                
-               tmp_be = select_backend( &ndn, 0, 0 );
-               free( ndn.bv_val );
+               tmp_be = select_backend( &nvnc, 0, 0 );
                if ( tmp_be != NULL && tmp_be != be ) {
                        fprintf( stderr, 
        "%s: line %d: suffix already in use by another backend in"
        " \"suffixMassage <suffix> <massaged suffix>\"\n",
                                fname, lineno );
+                       free( pvnc.bv_val );
+                       free( nvnc.bv_val );
                        return 1;                                               
                }
 
                dn.bv_val = argv[ 2 ];
                dn.bv_len = strlen( argv[ 2 ] );
-               if ( dnNormalize2( NULL, &dn, &ndn ) != LDAP_SUCCESS ) {
+               if ( dnPrettyNormal( NULL, &dn, &prnc, &nrnc ) != LDAP_SUCCESS ) {
                        fprintf( stderr, "%s: line %d: "
                                        "massaged suffix '%s' is invalid\n",
                                        fname, lineno, argv[ 2 ] );
+                       free( pvnc.bv_val );
+                       free( nvnc.bv_val );
                        return 1;
                }
-               
-               tmp_be = select_backend( &ndn, 0, 0 );
-               free( ndn.bv_val );
+       
+#if 0  
+               tmp_be = select_backend( &nrnc, 0, 0 );
                if ( tmp_be != NULL ) {
                        fprintf( stderr,
        "%s: line %d: massaged suffix already in use by another backend in" 
        " \"suffixMassage <suffix> <massaged suffix>\"\n",
                                 fname, lineno );
+                       free( pvnc.bv_val );
+                       free( nvnc.bv_val );
+                       free( prnc.bv_val );
+                       free( nrnc.bv_val );
                         return 1;
                }
+#endif
                
                /*
                 * The suffix massaging is emulated by means of the
@@ -471,7 +472,7 @@ meta_back_db_config(
                 * to the database
                 */
                return suffix_massage_config( li->targets[ i ]->rwinfo,
-                               argc, argv );
+                               &pvnc, &nvnc, &prnc, &nrnc );
                
        /* rewrite stuff ... */
        } else if ( strncasecmp( argv[ 0 ], "rewrite", 7 ) == 0 ) {
@@ -502,7 +503,7 @@ meta_back_db_config(
 
                if ( argc < 3 || argc > 4 ) {
                        fprintf( stderr,
-       "%s: line %d: syntax is \"map {objectclass | attribute} {<source> | *} [<dest> | *]\"\n",
+       "%s: line %d: syntax is \"map {objectclass | attribute} [<local> | *] {<foreign> | *}\"\n",
                                fname, lineno );
                        return 1;
                }
@@ -513,32 +514,23 @@ meta_back_db_config(
                        map = &li->targets[ i ]->at_map;
                } else {
                        fprintf( stderr,
-       "%s: line %d: syntax is \"map {objectclass | attribute} {<source> | *} [<dest> | *]\"\n",
+       "%s: line %d: syntax is \"map {objectclass | attribute} [<local> | *] {<foreign> | *}\"\n",
                                fname, lineno );
                        return 1;
                }
 
-               if ( strcasecmp( argv[ 2 ], "*" ) != 0 ) {
-                       src = argv[ 2 ];
-                       if ( argc < 4 ) {
-                               dst = "";
-                       } else if ( strcasecmp( argv[ 3 ], "*" ) == 0 ) {
-                               dst = src;
-                       } else {
-                               dst = argv[ 3 ];
-                       }
-               } else {
-                       if ( argc < 4 ) {
-                               map->drop_missing = 1;
+               if ( strcmp( argv[ 2 ], "*" ) == 0 ) {
+                       if ( argc < 4 || strcmp( argv[ 3 ], "*" ) == 0 ) {
+                               map->drop_missing = ( argc < 4 );
                                return 0;
                        }
-                       if ( strcasecmp( argv[ 3 ], "*" ) == 0 ) {
-                               map->drop_missing = 0;
-                               return 0;
-                       }
-
-                       src = argv[ 3 ];
-                       dst = src;
+                       src = dst = argv[ 3 ];
+               } else if ( argc < 4 ) {
+                       src = "";
+                       dst = argv[ 2 ];
+               } else {
+                       src = argv[ 2 ];
+                       dst = ( strcmp( argv[ 3 ], "*" ) == 0 ? src : argv[ 3 ] );
                }
 
                if ( ( map == &li->targets[ i ]->at_map )
@@ -558,16 +550,12 @@ meta_back_db_config(
                }
                ber_str2bv( src, 0, 1, &mapping->src );
                ber_str2bv( dst, 0, 1, &mapping->dst );
-               if ( *dst != 0 ) {
-                       mapping[ 1 ].src = mapping->dst;
-                       mapping[ 1 ].dst = mapping->src;
-               } else {
-                       mapping[ 1 ].src = mapping->src;
-                       mapping[ 1 ].dst = mapping->dst;
-               }
+               mapping[ 1 ].src = mapping->dst;
+               mapping[ 1 ].dst = mapping->src;
 
-               if ( avl_find( map->map, ( caddr_t )mapping,
-                               mapping_cmp ) != NULL
+               if ( (*src != '\0' &&
+                         avl_find( map->map, ( caddr_t )mapping,
+                               mapping_cmp ) != NULL)
                        || avl_find( map->remap, ( caddr_t )&mapping[ 1 ],
                                mapping_cmp ) != NULL) {
                        fprintf( stderr,
@@ -576,8 +564,9 @@ meta_back_db_config(
                        return 0;
                }
 
-               avl_insert( &map->map, ( caddr_t )mapping,
-                                       mapping_cmp, mapping_dup );
+               if ( *src != '\0' )
+                       avl_insert( &map->map, ( caddr_t )mapping,
+                                               mapping_cmp, mapping_dup );
                avl_insert( &map->remap, ( caddr_t )&mapping[ 1 ],
                                        mapping_cmp, mapping_dup );