ITS#1716 is_entry_subentr/ies/y/

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

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index b9c7c645bf3a80d8b8a5c34496ffff0547fa6c3f..41cd090c6857ca2054a95d578030d34b5e1c3dc9 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -16,7 +16,8 @@ LDAP_BEGIN_DECL
 LDAP_SLAPD_F (int) access_allowed LDAP_P((
        Backend *be, Connection *conn, Operation *op,
        Entry *e, AttributeDescription *desc, struct berval *val,
-       slap_access_t access ));
+       slap_access_t access,
+       AccessControlState *state ));
 LDAP_SLAPD_F (int) acl_check_modlist LDAP_P((
        Backend *be, Connection *conn, Operation *op,
        Entry *e, Modifications *ml ));
@@ -52,13 +53,11 @@ LDAP_SLAPD_F (int) slap_bv2ad LDAP_P((
        AttributeDescription **ad,
        const char **text ));
 
-LDAP_SLAPD_F (AttributeDescription *) ad_dup LDAP_P((
-       AttributeDescription *desc ));
-
 LDAP_SLAPD_F (void) ad_destroy LDAP_P(( AttributeDescription * ));
 
-#define ad_cmp(l,r)    (((l)->ad_cname.bv_len == (r)->ad_cname.bv_len) \
-       ? strcasecmp((l)->ad_cname.bv_val, (r)->ad_cname.bv_val ) : 1 )
+#define ad_cmp(l,r)    (((l)->ad_cname.bv_len < (r)->ad_cname.bv_len) \
+       ? -1 : (((l)->ad_cname.bv_len > (r)->ad_cname.bv_len) \
+               ? 1 : strcasecmp((l)->ad_cname.bv_val, (r)->ad_cname.bv_val )))
 
 LDAP_SLAPD_F (int) is_ad_subtype LDAP_P((
        AttributeDescription *sub,
@@ -167,7 +166,7 @@ LDAP_SLAPD_F (BackendDB *) select_backend LDAP_P((
        int noSubordinates ));
 
 LDAP_SLAPD_F (int) be_issuffix LDAP_P(( Backend *be,
-       const char *suffix ));
+       struct berval *suffix ));
 LDAP_SLAPD_F (int) be_isroot LDAP_P(( Backend *be,
        struct berval *ndn ));
 LDAP_SLAPD_F (int) be_isroot_pw LDAP_P(( Backend *be,
@@ -346,7 +345,9 @@ LDAP_SLAPD_F (void) slapd_clr_read LDAP_P((ber_socket_t s, int wake));
  * dn.c
  */
 
-#define dn_match(dn1, dn2)     ( ber_cmp((dn1), (dn2)) == 0 )
+#define dn_match(dn1, dn2)     ( ber_bvcmp((dn1), (dn2)) == 0 )
+
+LDAP_SLAPD_V( const struct berval ) slap_empty_bv;
 
 LDAP_SLAPD_F (int) dnValidate LDAP_P((
        Syntax *syntax, 
@@ -401,12 +402,7 @@ LDAP_SLAPD_F (void) build_new_dn LDAP_P((
        struct berval * parent_dn,
        struct berval * newrdn ));
 
-#define SLAP_DN_MIGRATION
-#ifdef SLAP_DN_MIGRATION
-       /* These routines are deprecated!!! */
-LDAP_SLAPD_F (char *) dn_normalize LDAP_P(( char *dn ));
-LDAP_SLAPD_F (char *) dn_parent LDAP_P(( Backend *be, const char *dn ));
-#endif
+LDAP_SLAPD_F (void) dnParent LDAP_P(( struct berval *dn, struct berval *pdn ));
 
 /*
  * entry.c
@@ -442,10 +438,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 ));
@@ -454,7 +446,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
@@ -463,11 +455,10 @@ LDAP_SLAPD_F (int) get_filter LDAP_P((
        Connection *conn,
        BerElement *ber,
        Filter **filt,
-       struct berval *fstr,
        const char **text ));
 
 LDAP_SLAPD_F (void) filter_free LDAP_P(( Filter *f ));
-LDAP_SLAPD_F (void) filter_print LDAP_P(( Filter *f ));
+LDAP_SLAPD_F (void) filter2bv LDAP_P(( Filter *f, struct berval *bv ));
 
 /*
  * filterentry.c
@@ -479,7 +470,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 ));
 
 /*
@@ -519,25 +509,13 @@ LDAP_SLAPD_F (int) lock_fclose LDAP_P(( FILE *fp, FILE *lfp ));
 
 /*
  * modify.c
- *     should be relocated to separate file
  */
-LDAP_SLAPD_F( void ) slap_mod_free( Modification *mod, int freeit );
-LDAP_SLAPD_F( void ) slap_mods_free( Modifications *mods );
-LDAP_SLAPD_F( void ) slap_modlist_free( LDAPModList *ml );
-
 LDAP_SLAPD_F( int ) slap_mods_check(
        Modifications *ml,
        int update,
        const char **text,
        char *textbuf, size_t textlen );
 
-LDAP_SLAPD_F( int ) slap_modlist2mods(
-       LDAPModList *ml,
-       int update,
-       Modifications **mods,
-       const char **text,
-       char *textbuf, size_t textlen );
-
 LDAP_SLAPD_F( int ) slap_mods_opattrs(
        Operation *op,
        Modifications *mods,
@@ -545,6 +523,23 @@ LDAP_SLAPD_F( int ) slap_mods_opattrs(
        const char **text,
        char *textbuf, size_t textlen );
 
+/*
+ * mods.c
+ */
+LDAP_SLAPD_F( int ) modify_add_values( Entry *e,
+       Modification *mod,
+       const char **text, char *textbuf, size_t textlen );
+LDAP_SLAPD_F( int ) modify_delete_values( Entry *e,
+       Modification *mod,
+       const char **text, char *textbuf, size_t textlen );
+LDAP_SLAPD_F( int ) modify_replace_values( Entry *e,
+       Modification *mod,
+       const char **text, char *textbuf, size_t textlen );
+
+LDAP_SLAPD_F( void ) slap_mod_free( Modification *mod, int freeit );
+LDAP_SLAPD_F( void ) slap_mods_free( Modifications *mods );
+LDAP_SLAPD_F( void ) slap_modlist_free( LDAPModList *ml );
+
 /*
  * module.c
  */
@@ -593,6 +588,7 @@ LDAP_SLAPD_F (int) register_matching_rule LDAP_P((
        const char *associated ));
 
 LDAP_SLAPD_F (int) mr_schema_info( Entry *e );
+LDAP_SLAPD_F (int) mru_schema_info( Entry *e );
 
 /*
  * mra.c
@@ -616,21 +612,26 @@ 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 ));
+       Entry *, ObjectClass *oc, int set_flags ));
 #define is_entry_alias(e)              \
-       is_entry_objectclass((e), slap_schema.si_oc_alias)
+       (((e)->e_ocflags & SLAP_OC__END) ? ((e)->e_ocflags & SLAP_OC_ALIAS) : \
+       is_entry_objectclass((e), slap_schema.si_oc_alias, 1))
 #define is_entry_referral(e)   \
-       is_entry_objectclass((e), slap_schema.si_oc_referral)
+       (((e)->e_ocflags & SLAP_OC__END) ? ((e)->e_ocflags & SLAP_OC_REFERRAL) : \
+       is_entry_objectclass((e), slap_schema.si_oc_referral, 1))
 #define is_entry_subentry(e)   \
-       is_entry_objectclass((e), slap_schema.si_oc_subentry)
-#define is_entry_collectiveAttributes(e)       \
-       is_entry_objectclass((e), slap_schema.si_oc_collectiveAttributes)
+       (((e)->e_ocflags & SLAP_OC__END) ? ((e)->e_ocflags & SLAP_OC_SUBENTRY) : \
+       is_entry_objectclass((e), slap_schema.si_oc_subentry, 1))
+#define is_entry_collectiveAttributeSubentry(e)        \
+       (((e)->e_ocflags & SLAP_OC__END) ? ((e)->e_ocflags & SLAP_OC_COLLECTIVEATTRIBUTESUBENTRY) : \
+       is_entry_objectclass((e), slap_schema.si_oc_collectiveAttributeSubentry, 1))
 #define is_entry_dynamicObject(e)      \
-       is_entry_objectclass((e), slap_schema.si_oc_dynamicObject)
+       (((e)->e_ocflags & SLAP_OC__END) ? ((e)->e_ocflags & SLAP_OC_DYNAMICOBJECT) : \
+       is_entry_objectclass((e), slap_schema.si_oc_dynamicObject, 1))
 
 LDAP_SLAPD_F (int) oc_schema_info( Entry *e );
 
@@ -713,6 +714,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, int exclude ));
 LDAP_SLAPD_F (void) replog LDAP_P(( Backend *be, Operation *op,
        struct berval *dn, struct berval *ndn, void *change ));
 
@@ -802,15 +805,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 ));
 
@@ -934,12 +939,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,
@@ -1024,6 +1039,8 @@ LDAP_SLAPD_V (AccessControl *) global_acl;
 
 LDAP_SLAPD_V (ber_socket_t)    dtblsize;
 
+LDAP_SLAPD_V (int)             use_reverse_lookup;
+
 /*
  * operations
  */