provisions for user-supplied permissions

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

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 98a880be92f0a1cd143da73b82aed507db029df8..e54a8c933ff81227b7d3e4822d7f59467a7b9ce8 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
  */
@@ -818,15 +810,17 @@ LDAP_SLAPD_F (int) slap_sasl_bind LDAP_P((
        Connection *conn, Operation *op, 
        struct berval *dn, struct berval *ndn,
        struct berval *cred,
-       char **edn, slap_ssf_t *ssf ));
+       struct berval *edn, slap_ssf_t *ssf ));
 
 /*
  * saslauthz.c
  */
-LDAP_SLAPD_F (char *) slap_sasl2dn LDAP_P((    char *saslname ));
+LDAP_SLAPD_F (void) slap_sasl2dn LDAP_P((
+       struct berval *saslname,
+       struct berval *dn ));
 LDAP_SLAPD_F (int) slap_sasl_authorized LDAP_P((
-       char *authcid,
-       char *authzid ));
+       struct berval *authcid,
+       struct berval *authzid ));
 LDAP_SLAPD_F (int) slap_sasl_regexp_config LDAP_P((
        const char *match, const char *replace ));