Add validation.

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

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 2d28064dcb8a737f7928cc1655675011a6a54abd..444fbe4b5b5fcf0527e6386253e13710d62dc619 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -441,10 +441,6 @@ typedef int (SLAP_EXTOP_MAIN_FN) LDAP_P((
 typedef int (SLAP_EXTOP_GETOID_FN) LDAP_P((
        int index, char *oid, int blen ));
 
-LDAP_SLAPD_F (int) load_extension LDAP_P((
-       const void *module, const char *file_name));
-LDAP_SLAPD_F (char *) get_supported_extension LDAP_P((int index));
-
 LDAP_SLAPD_F (int) load_extop LDAP_P((
        const char *ext_oid,
        SLAP_EXTOP_MAIN_FN *ext_main ));
@@ -453,7 +449,7 @@ LDAP_SLAPD_F (int) extops_init LDAP_P(( void ));
 
 LDAP_SLAPD_F (int) extops_kill LDAP_P(( void ));
 
-LDAP_SLAPD_F (char *) get_supported_extop LDAP_P((int index));
+LDAP_SLAPD_F (struct berval *) get_supported_extop LDAP_P((int index));
 
 /*
  * filter.c
@@ -619,8 +615,8 @@ LDAP_SLAPD_F (ObjectClass *) oc_find LDAP_P((
 LDAP_SLAPD_F (ObjectClass *) oc_bvfind LDAP_P((
        struct berval *ocname));
 LDAP_SLAPD_F (int) is_object_subclass LDAP_P((
-       ObjectClass *sub,
-       ObjectClass *sup ));
+       ObjectClass *sup,
+       ObjectClass *sub ));
 
 LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P((
        Entry *, ObjectClass *oc, int set_flags ));
@@ -946,12 +942,22 @@ LDAP_SLAPD_F (void) slap_init_user LDAP_P(( char *username, char *groupname ));
 /*
  * value.c
  */
+LDAP_SLAPD_F (int) value_validate LDAP_P((
+       MatchingRule *mr,
+       struct berval *in,
+       const char ** text ));
 LDAP_SLAPD_F (int) value_normalize LDAP_P((
        AttributeDescription *ad,
        unsigned usage,
        struct berval *in,
        struct berval *out,
        const char ** text ));
+LDAP_SLAPD_F (int) value_validate_normalize LDAP_P((
+       AttributeDescription *ad,
+       unsigned usage,
+       struct berval *in,
+       struct berval *out,
+       const char ** text ));
 LDAP_SLAPD_F (int) value_match LDAP_P((
        int *match,
        AttributeDescription *ad,