--- servers/slapd/slap.h 2003/05/30 03:24:39 1.452 +++ servers/slapd/slap.h 2003/09/22 04:09:39 1.452.2.3 @@ -1,5 +1,5 @@ /* slap.h - stand alone ldap server include file */ -/* $OpenLDAP: pkg/ldap/servers/slapd/slap.h,v 1.451 2003/05/30 00:17:30 kurt Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/slap.h,v 1.452.2.2 2003/09/18 15:43:35 kurt Exp $ */ /* * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file @@ -32,13 +32,11 @@ #include #include +#include "lber_pvt.h" #include "ldap_pvt_thread.h" #include "ldap_queue.h" -#ifdef LDAP_DEVEL #define SLAP_EXTENDED_SCHEMA 1 -#define LDAP_CACHING -#endif LDAP_BEGIN_DECL /* @@ -77,9 +75,7 @@ LDAP_BEGIN_DECL #define SLAP_MAX_WORKER_THREADS (16) -#ifdef LDAP_SYNCREPL #define SLAP_MAX_SYNCREPL_THREADS (8) -#endif #define SLAP_SB_MAX_INCOMING_DEFAULT ((1<<18) - 1) #define SLAP_SB_MAX_INCOMING_AUTH ((1<<24) - 1) @@ -142,6 +138,7 @@ LDAP_BEGIN_DECL /* must match in schema_init.c */ #define SLAPD_DN_SYNTAX "1.3.6.1.4.1.1466.115.121.1.12" #define SLAPD_NAMEUID_SYNTAX "1.3.6.1.4.1.1466.115.121.1.34" +#define SLAPD_INTEGER_SYNTAX "1.3.6.1.4.1.1466.115.121.1.27" #define SLAPD_GROUP_ATTR "member" #define SLAPD_GROUP_CLASS "groupOfNames" #define SLAPD_ROLE_ATTR "roleOccupant" @@ -230,10 +227,6 @@ typedef struct slap_ssf_set { #define SLAP_SYNTAX_MATCHINGRULEUSES_OID "1.3.6.1.4.1.1466.115.121.1.31" #define SLAP_SYNTAX_CONTENTRULE_OID "1.3.6.1.4.1.1466.115.121.1.16" -#ifdef LDAP_CLIENT_UPDATE -#define LCUP_COOKIE_OID "1.3.6.1.4.1.4203.666.10.1" -#endif /* LDAP_CLIENT_UPDATE */ - /* * represents schema information for a database */ @@ -303,7 +296,7 @@ typedef struct slap_syntax { LDAPSyntax ssyn_syn; #define ssyn_oid ssyn_syn.syn_oid #define ssyn_desc ssyn_syn.syn_desc -#define ssyn_extensions ssyn_syn.syn_extensions +#define ssyn_extensions ssyn_syn.syn_extensions /* * Note: the former ber_len_t ssyn_oidlen; @@ -321,7 +314,11 @@ typedef struct slap_syntax { #define SLAP_SYNTAX_BLOB 0x0001U /* syntax treated as blob (audio) */ #define SLAP_SYNTAX_BINARY 0x0002U /* binary transfer required (certificate) */ #define SLAP_SYNTAX_BER 0x0004U /* stored in BER encoding (certificate) */ +#ifdef LDAP_DEVEL +#define SLAP_SYNTAX_HIDE 0x0000U /* publish everything */ +#else #define SLAP_SYNTAX_HIDE 0x8000U /* hide (do not publish) */ +#endif slap_syntax_validate_func *ssyn_validate; slap_syntax_transform_func *ssyn_pretty; @@ -418,7 +415,11 @@ typedef struct slap_matching_rule { slap_mask_t smr_usage; +#ifdef LDAP_DEVEL +#define SLAP_MR_HIDE 0x0000U +#else #define SLAP_MR_HIDE 0x8000U +#endif #define SLAP_MR_TYPE_MASK 0x0F00U #define SLAP_MR_SUBTYPE_MASK 0x00F0U @@ -571,7 +572,11 @@ typedef struct slap_attribute_type { #define SLAP_AT_NONE 0x0000U #define SLAP_AT_ABSTRACT 0x0100U /* cannot be instantiated */ #define SLAP_AT_FINAL 0x0200U /* cannot be subtyped */ +#ifdef LDAP_DEVEL +#define SLAP_AT_HIDE 0x0000U /* publish everything */ +#else #define SLAP_AT_HIDE 0x8000U /* hide attribute */ +#endif slap_mask_t sat_flags; LDAP_SLIST_ENTRY(slap_attribute_type) sat_next; @@ -636,10 +641,17 @@ typedef struct slap_object_class { #define SLAP_OC_SUBENTRY 0x0004 #define SLAP_OC_DYNAMICOBJECT 0x0008 #define SLAP_OC_COLLECTIVEATTRIBUTESUBENTRY 0x0010 -#define SLAP_OC__MASK 0x001F -#define SLAP_OC__END 0x0020 +#define SLAP_OC_GLUE 0x0020 +#define SLAP_OC_SYNCPROVIDERSUBENTRY 0x0040 +#define SLAP_OC_SYNCCONSUMERSUBENTRY 0x0080 +#define SLAP_OC__MASK 0x00FF +#define SLAP_OC__END 0x0100 #define SLAP_OC_OPERATIONAL 0x4000 +#ifdef LDAP_DEVEL +#define SLAP_OC_HIDE 0x0000 +#else #define SLAP_OC_HIDE 0x8000 +#endif /* * DIT content rule @@ -702,11 +714,9 @@ struct slap_internal_schema { ObjectClass *si_oc_collectiveAttributeSubentry; ObjectClass *si_oc_dynamicObject; -#ifdef LDAP_SYNCREPL - ObjectClass *si_oc_glue; - ObjectClass *si_oc_syncConsumerSubentry; - ObjectClass *si_oc_syncProviderSubentry; -#endif + ObjectClass *si_oc_glue; + ObjectClass *si_oc_syncConsumerSubentry; + ObjectClass *si_oc_syncProviderSubentry; /* objectClass attribute descriptions */ AttributeDescription *si_ad_objectClass; @@ -726,15 +736,12 @@ struct slap_internal_schema { AttributeDescription *si_ad_namingCSN; AttributeDescription *si_ad_superiorUUID; -#ifdef LDAP_CACHING /* LDAP cache specific operational attribute */ AttributeDescription *si_ad_queryid; -#endif /* LDAP_CACHING */ -#ifdef LDAP_SYNCREPL - AttributeDescription *si_ad_dseType; - AttributeDescription *si_ad_syncreplCookie; -#endif + AttributeDescription *si_ad_dseType; + AttributeDescription *si_ad_syncreplCookie; + AttributeDescription *si_ad_contextCSN; /* root DSE attribute descriptions */ AttributeDescription *si_ad_altServer; @@ -784,6 +791,7 @@ struct slap_internal_schema { AttributeDescription *si_ad_name; AttributeDescription *si_ad_cn; AttributeDescription *si_ad_userPassword; + AttributeDescription *si_ad_labeledURI; #ifdef SLAPD_AUTHPASSWD AttributeDescription *si_ad_authPassword; #endif @@ -1044,7 +1052,7 @@ typedef enum slap_style_e { ACL_STYLE_ONE, ACL_STYLE_SUBTREE, ACL_STYLE_CHILDREN, - ACL_STYLE_ATTROF, + ACL_STYLE_ATTROF } slap_style_t; typedef struct slap_authz_info { @@ -1166,6 +1174,9 @@ typedef struct slap_acl { regex_t acl_dn_re; struct berval acl_dn_pat; AttributeName *acl_attrs; + slap_style_t acl_attrval_style; + regex_t acl_attrval_re; + struct berval acl_attrval; /* "by" part: list of who has what access to the entries */ Access *acl_access; @@ -1267,8 +1278,6 @@ typedef BackendDB Backend; #define nbackends nBackendDB #define backends backendDB -#ifdef LDAP_SYNCREPL - struct nonpresent_entry { struct berval *dn; struct berval *ndn; @@ -1282,84 +1291,44 @@ typedef struct syncinfo_s { struct slap_conn *conn; struct slap_backend_db *be; struct slap_entry *e; - void *ctx; - int id; - char *masteruri; - struct berval *master_bv; - char *mastername; - int masterport; - int type; + void *ctx; + int id; + char *provideruri; + BerVarray provideruri_bv; +#define TLS_OFF 0 +#define TLS_ON 1 +#define TLS_CRITICAL 2 + int tls; struct berval updatedn; - char *binddn; - int bindmethod; - char *passwd; - char *secprops; - char *realm; - char *authcId; - char *authzId; - char *srvtab; - char *saslmech; + int bindmethod; + char *binddn; + char *passwd; + char *saslmech; + char *secprops; + char *realm; + char *authcId; + char *authzId; + char *srvtab; + int schemachecking; + Filter *filter; + char *filterstr; + char *base; + int scope; + int attrsonly; + char **attrs; + int type; time_t interval; - char *base; - int scope; - int deref; - int slimit; - int tlimit; - Filter *filter; - char *filterstr; - char **attrs; - int attrsonly; -#define LASTMOD_REQ 0 -#define LASTMOD_GEN 1 -#define LASTMOD_NO 2 - int lastmod; - /* TLS flags */ -#define TLS_OFF 0 -#define TLS_ON 1 -#define TLS_CRITICAL 2 - int tls; - int found; - struct berval *syncUUID; + struct berval *syncCookie; + int manageDSAit; + int slimit; + int tlimit; + struct berval *syncUUID; struct berval *syncUUID_ndn; - struct berval *syncCookie; - Avlnode *presentlist; + Avlnode *presentlist; + int sync_mode; LDAP_LIST_HEAD(np, nonpresent_entry) nonpresentlist; } syncinfo_t; -#define IDSTR "id" -#define MASTERSTR "master" -#define SUFFIXSTR "suffix" -#define UPDATEDNSTR "updatedn" -#define BINDDNSTR "binddn" -#define BINDMETHSTR "bindmethod" -#define SIMPLESTR "simple" -#define SASLSTR "sasl" -#define CREDSTR "credentials" -#define OLDAUTHCSTR "bindprincipal" -#define AUTHCSTR "authcID" -#define AUTHZSTR "authzID" -#define SRVTABSTR "srvtab" -#define SASLMECHSTR "saslmech" -#define REALMSTR "realm" -#define SECPROPSSTR "secprops" -#define TLSSTR "tls" -#define TLSCRITICALSTR "critical" - -#define FILTERSTR "filter" -#define SEARCHBASESTR "searchbase" -#define SCOPESTR "scope" -#define ATTRSSTR "attrs" -#define ATTRSONLYSTR "attrsonly" -#define TYPESTR "type" -#define INTERVALSTR "interval" -#define COOKIESTR "cookie" -#define LASTMODSTR "lastmod" -#define LMREQSTR "req" -#define LMGENSTR "gen" -#define LMNOSTR "no" - -#endif /* LDAP_SYNCREPL */ - struct slap_backend_db { BackendInfo *bd_info; /* pointer to shared backend info */ @@ -1408,29 +1377,39 @@ struct slap_backend_db { #define be_entry_get bd_info->bi_tool_entry_get #define be_entry_put bd_info->bi_tool_entry_put #define be_sync bd_info->bi_tool_sync +#define be_dn2id_get bd_info->bi_tool_dn2id_get +#define be_id2entry_get bd_info->bi_tool_id2entry_get +#define be_entry_modify bd_info->bi_tool_entry_modify #endif #define SLAP_BFLAG_NOLASTMOD 0x0001U +#define SLAP_BFLAG_NO_SCHEMA_CHECK 0x0002U #define SLAP_BFLAG_GLUE_INSTANCE 0x0010U /* a glue backend */ #define SLAP_BFLAG_GLUE_SUBORDINATE 0x0020U /* child of a glue hierarchy */ #define SLAP_BFLAG_GLUE_LINKED 0x0040U /* child is connected to parent */ -#define SLAP_BFLAG_ALIASES 0x0100U -#define SLAP_BFLAG_REFERRALS 0x0200U -#define SLAP_BFLAG_SUBENTRIES 0x0400U -#define SLAP_BFLAG_MONITOR 0x1000U -#define SLAP_BFLAG_DYNAMIC 0x2000U +#define SLAP_BFLAG_MONITOR 0x0080U /* a monitor backend */ +#define SLAP_BFLAG_INCREMENT 0x0100U +#define SLAP_BFLAG_ALIASES 0x1000U +#define SLAP_BFLAG_REFERRALS 0x2000U +#define SLAP_BFLAG_SUBENTRIES 0x4000U +#define SLAP_BFLAG_DYNAMIC 0x8000U slap_mask_t be_flags; #define SLAP_LASTMOD(be) (!((be)->be_flags & SLAP_BFLAG_NOLASTMOD)) +#define SLAP_NO_SCHEMA_CHECK(be) (((be)->be_flags & SLAP_BFLAG_NO_SCHEMA_CHECK)) #define SLAP_GLUE_INSTANCE(be) ((be)->be_flags & SLAP_BFLAG_GLUE_INSTANCE) #define SLAP_GLUE_SUBORDINATE(be) \ ((be)->be_flags & SLAP_BFLAG_GLUE_SUBORDINATE) #define SLAP_GLUE_LINKED(be) ((be)->be_flags & SLAP_BFLAG_GLUE_LINKED) + +#define SLAP_MONITOR(be) ((be)->be_flags & SLAP_BFLAG_MONITOR) +#define SLAP_INCREMENT(be) ((be)->be_flags & SLAP_BFLAG_INCREMENT) + #define SLAP_ALIASES(be) ((be)->be_flags & SLAP_BFLAG_ALIASES) #define SLAP_REFERRALS(be) ((be)->be_flags & SLAP_BFLAG_REFERRALS) #define SLAP_SUBENTRIES(be) ((be)->be_flags & SLAP_BFLAG_SUBENTRIES) -#define SLAP_MONITOR(be) ((be)->be_flags & SLAP_BFLAG_MONITOR) #define SLAP_DYNAMIC(be) ((be)->be_flags & SLAP_BFLAG_DYNAMIC) + slap_mask_t be_restrictops; /* restriction operations */ #define SLAP_RESTRICT_OP_ADD 0x0001U #define SLAP_RESTRICT_OP_BIND 0x0002U @@ -1458,9 +1437,7 @@ struct slap_backend_db { #define SLAP_DISALLOW_BIND_ANON 0x0001U /* no anonymous */ #define SLAP_DISALLOW_BIND_SIMPLE 0x0002U /* simple authentication */ -#define SLAP_DISALLOW_BIND_SIMPLE_UNPROTECTED \ - 0x0004U /* unprotected simple auth */ -#define SLAP_DISALLOW_BIND_KRBV4 0x0008U /* Kerberos V4 authentication */ +#define SLAP_DISALLOW_BIND_KRBV4 0x0004U /* Kerberos V4 authentication */ #define SLAP_DISALLOW_TLS_2_ANON 0x0010U /* StartTLS -> Anonymous */ #define SLAP_DISALLOW_TLS_AUTHC 0x0020U /* TLS while authenticated */ @@ -1500,9 +1477,11 @@ struct slap_backend_db { void *be_private; /* anything the backend database needs */ void *be_pb; /* Netscape plugin */ -#ifdef LDAP_SYNCREPL + LDAP_TAILQ_HEAD( pcl, slap_csn_entry ) be_pending_csn_list; + ldap_pvt_thread_mutex_t be_pcl_mutex; + struct berval be_context_csn; + ldap_pvt_thread_mutex_t be_context_csn_mutex; syncinfo_t *syncinfo; /* For syncrepl */ -#endif }; struct slap_conn; @@ -1577,7 +1556,8 @@ typedef enum slap_reply_e { REP_SASL, REP_EXTENDED, REP_SEARCH, - REP_SEARCHREF + REP_SEARCHREF, + REP_INTERMEDIATE } slap_reply_t; typedef struct rep_sasl_s { @@ -1653,6 +1633,10 @@ typedef ID (BI_tool_entry_put) LDAP_P(( struct berval *text )); typedef int (BI_tool_entry_reindex) LDAP_P(( BackendDB *be, ID id )); typedef int (BI_tool_sync) LDAP_P(( BackendDB *be )); +typedef ID (BI_tool_dn2id_get) LDAP_P(( BackendDB *be, struct berval *dn )); +typedef int (BI_tool_id2entry_get) LDAP_P(( BackendDB *be, ID id, Entry **e )); +typedef ID (BI_tool_entry_modify) LDAP_P(( BackendDB *be, Entry *e, + struct berval *text )); struct slap_backend_info { char *bi_type; /* type of backend */ @@ -1737,14 +1721,17 @@ struct slap_backend_info { BI_connection_destroy *bi_connection_destroy; /* hooks for slap tools */ - BI_tool_entry_open *bi_tool_entry_open; - BI_tool_entry_close *bi_tool_entry_close; - BI_tool_entry_first *bi_tool_entry_first; - BI_tool_entry_next *bi_tool_entry_next; - BI_tool_entry_get *bi_tool_entry_get; - BI_tool_entry_put *bi_tool_entry_put; + BI_tool_entry_open *bi_tool_entry_open; + BI_tool_entry_close *bi_tool_entry_close; + BI_tool_entry_first *bi_tool_entry_first; + BI_tool_entry_next *bi_tool_entry_next; + BI_tool_entry_get *bi_tool_entry_get; + BI_tool_entry_put *bi_tool_entry_put; BI_tool_entry_reindex *bi_tool_entry_reindex; - BI_tool_sync *bi_tool_sync; + BI_tool_sync *bi_tool_sync; + BI_tool_dn2id_get *bi_tool_dn2id_get; + BI_tool_id2entry_get *bi_tool_id2entry_get; + BI_tool_entry_modify *bi_tool_entry_modify; #define SLAP_INDEX_ADD_OP 0x0001 #define SLAP_INDEX_DELETE_OP 0x0002 @@ -1780,6 +1767,24 @@ typedef struct slap_callback { void *sc_private; } slap_callback; +struct slap_overinfo; + +typedef struct slap_overinst { + BackendInfo on_bi; + slap_response *on_response; + struct slap_overinfo *on_info; + struct slap_overinst *on_next; +} slap_overinst; + +typedef struct slap_overinfo { + BackendInfo oi_bi; + BackendDB oi_bd; + slap_overinst *oi_list; +} slap_overinfo; + +/* Should successive callbacks in a chain be processed? */ +#define SLAP_CB_CONTINUE 0x8000 + /* * Paged Results state */ @@ -1791,8 +1796,7 @@ typedef struct slap_paged_state { } PagedResultsState; -#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC) -#define LDAP_PSEARCH_BY_ADD 0x01 +#define LDAP_PSEARCH_BY_ADD 0x01 #define LDAP_PSEARCH_BY_DELETE 0x02 #define LDAP_PSEARCH_BY_PREMODIFY 0x03 #define LDAP_PSEARCH_BY_MODIFY 0x04 @@ -1802,8 +1806,16 @@ struct psid_entry { struct slap_op *ps_op; LDAP_LIST_ENTRY(psid_entry) ps_link; }; -#endif +struct slap_csn_entry { + struct berval *csn; + unsigned long opid; + unsigned long connid; +#define SLAP_CSN_PENDING 1 +#define SLAP_CSN_COMMIT 2 + long state; + LDAP_TAILQ_ENTRY (slap_csn_entry) csn_link; +}; /* * represents an operation pending from an ldap client @@ -1900,6 +1912,9 @@ typedef struct slap_op { char o_subentries_visibility; #define get_subentries_visibility(op) ((int)(op)->o_subentries_visibility) + char o_assert; +#define get_assert(op) ((int)(op)->o_assert) + char o_valuesreturnfilter; #ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY @@ -1916,6 +1931,11 @@ typedef struct slap_op { #define get_domainScope(op) (0) #endif + char o_preread; + char o_postread; + AttributeName *o_preread_attrs; + AttributeName *o_postread_attrs; + #ifdef LDAP_CONTROL_PAGEDRESULTS char o_pagedresults; #define get_pagedresults(op) ((int)(op)->o_pagedresults) @@ -1925,18 +1945,6 @@ typedef struct slap_op { #define get_pagedresults(op) (0) #endif -#ifdef LDAP_CLIENT_UPDATE - char o_clientupdate; - char o_clientupdate_type; -#define SLAP_LCUP_NONE (0x0) -#define SLAP_LCUP_SYNC (0x1) -#define SLAP_LCUP_PERSIST (0x2) -#define SLAP_LCUP_SYNC_AND_PERSIST (0x3) - ber_int_t o_clientupdate_interval; - struct berval o_clientupdate_state; -#endif - -#ifdef LDAP_SYNC char o_sync; char o_sync_mode; #define SLAP_SYNC_NONE (0x0) @@ -1944,22 +1952,16 @@ typedef struct slap_op { #define SLAP_SYNC_PERSIST (0x2) #define SLAP_SYNC_REFRESH_AND_PERSIST (0x3) struct berval o_sync_state; -#endif -#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC) - int o_ps_protocol; int o_ps_entries; LDAP_LIST_ENTRY(slap_op) o_ps_link; LDAP_LIST_HEAD(pe, psid_entry) o_pm_list; -#endif AuthorizationInformation o_authz; - BerElement *o_ber; /* ber of the request */ -#ifdef LDAP_CONNECTIONLESS - BerElement *o_res_ber; /* ber of the reply */ -#endif - slap_callback *o_callback; /* callback pointers */ + BerElement *o_ber; /* ber of the request */ + BerElement *o_res_ber; /* ber of the CLDAP reply or readback control */ + slap_callback *o_callback; /* callback pointers */ LDAPControl **o_ctrls; /* controls */ void *o_threadctx; /* thread pool thread context */ @@ -1972,38 +1974,50 @@ typedef struct slap_op { void *o_private; /* anything the backend needs */ LDAP_STAILQ_ENTRY(slap_op) o_next; /* next operation in list */ - ValuesReturnFilter *vrFilter; /* Structure represents ValuesReturnFilter */ -#ifdef LDAP_CACHING - char o_caching_on; -#endif /*LDAP_CACHING */ + Filter *o_assertion; /* Assert control filter */ +#define get_assertion(op) ((op)->o_assertion) + + ValuesReturnFilter *o_vrFilter; /* ValuesReturnFilter */ + + syncinfo_t* o_si; #ifdef LDAP_SLAPI void *o_pb; /* NS-SLAPI plugin */ + void *o_extensions; /* NS-SLAPI plugin */ #endif } Operation; -#define send_ldap_error( op, rs, err, text ) \ -do { (rs)->sr_err = err; (rs)->sr_text = text; \ -(op->o_conn->c_send_ldap_result)( op, rs ); } while (0) -#define send_ldap_discon( op, rs, err, text ) \ -do { (rs)->sr_err = err; (rs)->sr_text = text; \ -send_ldap_disconnect( op, rs ); } while (0) -typedef void (SEND_LDAP_RESULT)(struct slap_op *op, struct slap_rep *rs); -typedef int (SEND_SEARCH_ENTRY)(struct slap_op *op, struct slap_rep *rs); -typedef int (SEND_SEARCH_REFERENCE)(struct slap_op *op, struct slap_rep *rs); -typedef void (SEND_LDAP_EXTENDED)(struct slap_op *op, struct slap_rep *rs); -typedef void (SEND_LDAP_INTERMEDIATE_RESP)(struct slap_op *op, struct slap_rep *rs); +#define send_ldap_error( op, rs, err, text ) do { \ + (rs)->sr_err = err; (rs)->sr_text = text; \ + (op->o_conn->c_send_ldap_result)( op, rs ); \ + } while (0) +#define send_ldap_discon( op, rs, err, text ) do { \ + (rs)->sr_err = err; (rs)->sr_text = text; \ + send_ldap_disconnect( op, rs ); \ + } while (0) + +typedef void (SEND_LDAP_RESULT)( + struct slap_op *op, struct slap_rep *rs); +typedef int (SEND_SEARCH_ENTRY)( + struct slap_op *op, struct slap_rep *rs); +typedef int (SEND_SEARCH_REFERENCE)( + struct slap_op *op, struct slap_rep *rs); +typedef void (SEND_LDAP_EXTENDED)( + struct slap_op *op, struct slap_rep *rs); +typedef void (SEND_LDAP_INTERMEDIATE)( + struct slap_op *op, struct slap_rep *rs); + #define send_ldap_result( op, rs ) \ -(op->o_conn->c_send_ldap_result)( op, rs ) + (op->o_conn->c_send_ldap_result)( op, rs ) #define send_search_entry( op, rs ) \ -(op->o_conn->c_send_search_entry)( op, rs ) + (op->o_conn->c_send_search_entry)( op, rs ) #define send_search_reference( op, rs ) \ -(op->o_conn->c_send_search_reference)( op, rs ) + (op->o_conn->c_send_search_reference)( op, rs ) #define send_ldap_extended( op, rs ) \ -(op->o_conn->c_send_ldap_extended)( op, rs ) -#define send_ldap_intermediate_resp( op, rs ) \ -(op->o_conn->c_send_ldap_intermediate_resp)( op, rs ) + (op->o_conn->c_send_ldap_extended)( op, rs ) +#define send_ldap_intermediate( op, rs ) \ + (op->o_conn->c_send_ldap_intermediate)( op, rs ) /* * Caches the result of a backend_group check for ACL evaluation @@ -2089,6 +2103,7 @@ typedef struct slap_conn { long c_n_write; /* num of write calls */ void *c_pb; /* Netscape plugin */ + void *c_extensions; /* Netscape plugin */ /* * These are the "callbacks" that are available for back-ends to @@ -2099,10 +2114,10 @@ typedef struct slap_conn { SEND_SEARCH_ENTRY *c_send_search_entry; SEND_SEARCH_REFERENCE *c_send_search_reference; SEND_LDAP_EXTENDED *c_send_ldap_extended; -#ifdef LDAP_RES_INTERMEDIATE_RESP - SEND_LDAP_INTERMEDIATE_RESP *c_send_ldap_intermediate_resp; +#ifdef LDAP_RES_INTERMEDIATE + SEND_LDAP_INTERMEDIATE *c_send_ldap_intermediate; #endif - + } Connection; #if defined(LDAP_SYSLOG) && defined(LDAP_DEBUG) @@ -2171,22 +2186,17 @@ enum { #define SLAP_LDAPDN_PRETTY 0x1 #define SLAP_LDAPDN_MAXLEN 8192 -/* - * Macros for LCUP - */ -#ifdef LDAP_CLIENT_UPDATE -#define SLAP_LCUP_STATE_UPDATE_TRUE 1 -#define SLAP_LCUP_STATE_UPDATE_FALSE 0 -#define SLAP_LCUP_ENTRY_DELETED_TRUE 1 -#define SLAP_LCUP_ENTRY_DELETED_FALSE 0 -#endif /* LDAP_CLIENT_UPDATE */ +/* number of response controls supported */ +#define SLAP_MAX_RESPONSE_CONTROLS 6 -#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC) -#define SLAP_SEARCH_MAX_CTRLS 10 +#ifdef LDAP_DEVEL +#define SLAP_CTRL_HIDE 0x00000000U +#else +#define SLAP_CTRL_HIDE 0x80000000U #endif -#define SLAP_CTRL_FRONTEND 0x80000000U -#define SLAP_CTRL_FRONTEND_SEARCH 0x01000000U /* for NOOP */ +#define SLAP_CTRL_FRONTEND 0x00800000U +#define SLAP_CTRL_FRONTEND_SEARCH 0x00010000U /* for NOOP */ #define SLAP_CTRL_OPFLAGS 0x0000FFFFU #define SLAP_CTRL_ABANDON 0x00000001U