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,
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,
/*
* dn.c
*/
-#define dn_match(dn1, dn2) \
- (((dn1)->bv_len == (dn2)->bv_len) \
- && (strcmp((dn1)->bv_val, (dn2)->bv_val) == 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,
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
/*
* 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,
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
*/
ObjectClass *sup ));
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 );
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 ));
* user.c
*/
#if defined(HAVE_PWD_H) && defined(HAVE_GRP_H)
-LDAP_SLAPD_F (void) slap_init_user LDAP_P(( char *username, char *groupname ));
+LDAP_SLAPD_F (void) slap_init_user LDAP_P((
+ const char *username, const char *groupname ));
#endif
/*