servers/slapd/slap.h - diff

Return to slap.h CVS log

Up to [OpenLDAP] / servers / slapd

Diff for /servers/slapd/slap.h between versions 1.452.2.24 and 1.452.2.27

version 1.452.2.24, 2004/08/30 17:47:12	version 1.452.2.27, 2004/09/02 09:08:20
Line 1	Line 1
/* slap.h - stand alone ldap server include file */	/* slap.h - stand alone ldap server include file */
/* $OpenLDAP: pkg/ldap/servers/slapd/slap.h,v 1.452.2.23 2004/07/16 19:32:01 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/slap.h,v 1.452.2.26 2004/09/01 02:13:18 kurt Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 1998-2004 The OpenLDAP Foundation.	* Copyright 1998-2004 The OpenLDAP Foundation.
Line 610 typedef struct slap_attribute_type {	Line 610 typedef struct slap_attribute_type {
#else	#else
#define SLAP_AT_HIDE 0x8000U /* hide attribute */	#define SLAP_AT_HIDE 0x8000U /* hide attribute */
#endif	#endif
	#define SLAP_AT_DYNAMIC 0x0400U /* dynamically generated */

slap_mask_t sat_flags;	slap_mask_t sat_flags;

LDAP_SLIST_ENTRY(slap_attribute_type) sat_next;	LDAP_SLIST_ENTRY(slap_attribute_type) sat_next;
Line 1394 typedef struct syncinfo_s {	Line 1396 typedef struct syncinfo_s {
int si_scope;	int si_scope;
int si_attrsonly;	int si_attrsonly;
char **si_attrs;	char **si_attrs;
	char **si_exattrs;
int si_type;	int si_type;
time_t si_interval;	time_t si_interval;
time_t *si_retryinterval;	time_t *si_retryinterval;
Line 1630 typedef struct req_add_s {	Line 1633 typedef struct req_add_s {
Entry *rs_e;	Entry *rs_e;
} req_add_s;	} req_add_s;

	typedef struct req_delete_s {
	struct berval rd_csn;
	} req_delete_s;

typedef struct req_abandon_s {	typedef struct req_abandon_s {
ber_int_t rs_msgid;	ber_int_t rs_msgid;
} req_abandon_s;	} req_abandon_s;
Line 1992 typedef struct slap_op {	Line 1999 typedef struct slap_op {
req_add_s oq_add;	req_add_s oq_add;
req_bind_s oq_bind;	req_bind_s oq_bind;
req_compare_s oq_compare;	req_compare_s oq_compare;
	req_delete_s oq_delete;
req_modify_s oq_modify;	req_modify_s oq_modify;
req_modrdn_s oq_modrdn;	req_modrdn_s oq_modrdn;
req_search_s oq_search;	req_search_s oq_search;
Line 2005 typedef struct slap_op {	Line 2013 typedef struct slap_op {
#define oq_add o_request.oq_add	#define oq_add o_request.oq_add
#define oq_bind o_request.oq_bind	#define oq_bind o_request.oq_bind
#define oq_compare o_request.oq_compare	#define oq_compare o_request.oq_compare
	#define oq_delete o_request.oq_delete
#define oq_modify o_request.oq_modify	#define oq_modify o_request.oq_modify
#define oq_modrdn o_request.oq_modrdn	#define oq_modrdn o_request.oq_modrdn
#define oq_search o_request.oq_search	#define oq_search o_request.oq_search
Line 2019 typedef struct slap_op {	Line 2028 typedef struct slap_op {
#define orb_edn oq_bind.rb_edn	#define orb_edn oq_bind.rb_edn
#define orb_ssf oq_bind.rb_ssf	#define orb_ssf oq_bind.rb_ssf

	#define ord_csn oq_delete.rd_csn

#define ors_scope oq_search.rs_scope	#define ors_scope oq_search.rs_scope
#define ors_deref oq_search.rs_deref	#define ors_deref oq_search.rs_deref
#define ors_slimit oq_search.rs_slimit	#define ors_slimit oq_search.rs_slimit

Removed from v.1.452.2.24
changed lines
	Added in v.1.452.2.27