Changes from HEAD for beta

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

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index f404141cd6c41b3cc4c2ceadca36b1aa20c992bc..9685449d890f18a6e1bde12c3c84528b4eed58a3 100644 (file)
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -522,17 +522,11 @@ meta_back_db_config(
                int             i = li->ntargets-1;
 
                if ( i < 0 ) {
-#ifndef LDAP_CACHING
-                       fprintf( stderr,
-       "%s: line %d: need \"uri\" directive first\n",
-                               fname, lineno );
-#else /* LDAP_CACHING */
                        if ( strcasecmp( argv[0], "rewriteEngine" ) == 0 ) {
                                li->rwinfo = rewrite_info_init( REWRITE_MODE_USE_DEFAULT );
                        }
                        return rewrite_parse(li->rwinfo, fname, lineno,
                                        argc, argv); 
-#endif /* LDAP_CACHING */
                }
                
                return rewrite_parse( li->targets[ i ]->rwmap.rwm_rw, fname, lineno,
@@ -554,11 +548,9 @@ meta_back_db_config(
                                fname, lineno, argc, argv );
        /* anything else */
        } else {
-#ifdef LDAP_CACHING
                if ( meta_back_cache_config( be, fname, lineno, argc, argv ) == 0 ) {
                        return 0;
                }
-#endif /* LDAP_CACHING */
 
                fprintf( stderr,
        "%s: line %d: unknown directive \"%s\" in meta database definition"