Treat access to dn="" as access to dn.base="". Avoid empty regex.

[openldap] / servers / slapd / proto-slap.h

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index e0c0db726dcc5975a38b525b85aeccc23221c6fe..7b5ed869582023df4209abd3b438ed601723e706 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -406,14 +406,6 @@ LDAP_SLAPD_F (void) build_new_dn LDAP_P((
 
 LDAP_SLAPD_F (void) dnParent LDAP_P(( struct berval *dn, struct berval *pdn ));
 
-#ifdef HAVE_CYRUS_SASL
-#define SLAP_DN_MIGRATION 1
-#endif
-#ifdef SLAP_DN_MIGRATION
-       /* These routines are deprecated!!! */
-LDAP_SLAPD_F (char *) dn_normalize LDAP_P(( char *dn ));
-#endif
-
 /*
  * entry.c
  */
@@ -485,7 +477,6 @@ LDAP_SLAPD_F (int) test_filter LDAP_P((
 /*
  * index.c
  */
-LDAP_SLAPD_F (int) slap_index2prefix LDAP_P(( int indextype ));
 LDAP_SLAPD_F (int) slap_str2index LDAP_P(( const char *str, slap_mask_t *idx ));
 
 /*
@@ -729,6 +720,8 @@ LDAP_SLAPD_F (int) add_replica_info LDAP_P(( Backend *be,
        const char *host ));
 LDAP_SLAPD_F (int) add_replica_suffix LDAP_P(( Backend *be,
        int nr, const char *suffix ));
+LDAP_SLAPD_F (int) add_replica_attrs LDAP_P(( Backend *be,
+       int nr, char *attrs ));
 LDAP_SLAPD_F (void) replog LDAP_P(( Backend *be, Operation *op,
        struct berval *dn, struct berval *ndn, void *change ));