struct berval *nval ));
#else
#define attr_mergeit( e, d, v ) attr_merge( e, d, v )
-#define attr_mergeit_one( e, d, v ) attr_merge( e, d, v )
+#define attr_mergeit_one( e, d, v ) attr_merge_one( e, d, v )
LDAP_SLAPD_F (int) attr_merge LDAP_P(( Entry *e,
AttributeDescription *desc,
BerVarray vals ));
Connection *co,
Operation *op,
int senderrors ));
-
-LDAP_SLAPD_F (char *) get_supported_ctrl LDAP_P((int index));
-
-LDAP_SLAPD_F (slap_mask_t) get_supported_ctrl_mask LDAP_P((int index));
+LDAP_SLAPD_F (int) register_supported_control LDAP_P((
+ const char *controloid,
+ slap_mask_t controlmask,
+ char **controlexops,
+ SLAP_CTRL_PARSE_FN *controlparsefn ));
+LDAP_SLAPD_F (int) slap_controls_init LDAP_P ((void));
+LDAP_SLAPD_F (void) controls_destroy LDAP_P ((void));
+LDAP_SLAPD_F (int) controls_root_dse_info LDAP_P ((Entry *e));
+LDAP_SLAPD_F (int) get_supported_controls LDAP_P (( char ***ctrloidsp, slap_mask_t **ctrlmasks ));
/*
* config.c
Syntax *syntax,
struct berval *val ));
+#ifdef SLAP_NVALUES
LDAP_SLAPD_F (int) dnNormalize LDAP_P((
+ slap_mask_t use,
Syntax *syntax,
+ MatchingRule *mr,
struct berval *val,
- struct berval **normalized ));
-
-LDAP_SLAPD_F (int) dnNormalize2 LDAP_P((
+ struct berval *normalized ));
+#define dnNormalize2(s,v,n) dnNormalize(0,(s),NULL,(v),(n))
+#else
+LDAP_SLAPD_F (int) dnNormalize LDAP_P((
Syntax *syntax,
struct berval *val,
struct berval *normalized ));
+#define dnNormalize2(s,v,n) dnNormalize((s),(v),(n))
+#endif
LDAP_SLAPD_F (int) dnPretty LDAP_P((
Syntax *syntax,
LDAP_SLAPD_F (void) vrFilter2bv LDAP_P(( ValuesReturnFilter *f, struct berval *fstr ));
LDAP_SLAPD_F (int) filter_has_subordinates LDAP_P(( Filter *filter ));
+LDAP_SLAPD_F (int) filter_escape_value LDAP_P(( struct berval *in,
+ struct berval *out ));
/*
* filterentry.c
LDAP_SLAPD_F (int) slap_shutdown LDAP_P(( Backend *be ));
LDAP_SLAPD_F (int) slap_destroy LDAP_P((void));
-LDAP_SLAPD_V (char *) slap_known_controls[];
+LDAP_SLAPD_V (char **) slap_known_controls;
/*
* kerberos.c