From 323cd5f7131cbae18d4469ff3ea7719355ee0391 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 10 Aug 2005 18:28:49 +0000 Subject: [PATCH] Sync with HEAD --- CHANGES | 8 ++++++++ include/ldap_pvt_uc.h | 8 ++------ servers/slapd/acl.c | 5 +---- servers/slapd/back-sql/back-sql.h | 4 +--- servers/slapd/backend.c | 2 +- servers/slapd/modify.c | 14 ++++++-------- servers/slapd/result.c | 2 +- tests/data/slapd-glue-ldap.conf | 2 ++ 8 files changed, 22 insertions(+), 23 deletions(-) diff --git a/CHANGES b/CHANGES index 9954ca228a..0d324891ff 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,11 @@ OpenLDAP 2.3.5 Engineering Fixed slapd-sql truncating keyval column problem (ITS#3888) Fixed slapd-sql return code ignored problem (ITS#3891) Fixed slapd-ldap access to freed connection (ITS#3913) + Fixed slapo-ppolicy hashed length problem (ITS#3783) + Fixed slapi slapi_int_init operation problem (ITS#3868) + Fixed slapi slapi_entry_has_children bug (ITS#3879) + Fixed slapd substrings filter length checks (ITS#3790) + Fixed slapd thread pool initialization (ITS#3793) Build Environment Upgraded shtool (ITS#3752) Fixed cygwin shared libraries build problem (ITS#3712) @@ -17,6 +22,9 @@ OpenLDAP 2.3.5 Engineering Fixed test037 manageDIT discovery issue (ITS#3898) Fixed inclusion (ITS#3905) Fixed TLS inclusion (ITS#3912) + Documentation + Fixed Admin Guide authz v. saslauthz problem (ITS#3875) + Updated slapd.conf (ITS#3866) OpenLDAP 2.3.4 Release Initial release for "general use". diff --git a/include/ldap_pvt_uc.h b/include/ldap_pvt_uc.h index a9b2515757..56fa45283a 100644 --- a/include/ldap_pvt_uc.h +++ b/include/ldap_pvt_uc.h @@ -33,12 +33,8 @@ LDAP_BEGIN_DECL * UTF-8 (in utf-8.c) */ -typedef short ldap_ucs2_t; - -/* UCDATA uses UCS-2 passed in an unsigned long */ -typedef unsigned long ldap_unicode_t; -#define ldap_utf8_to_unicode( p ) ldap_utf8_to_ucs4((p)) -#define ldap_unicode_to_utf8( c, buf ) ldap_ucs4_to_ucs4((c),(buf)) +/* UCDATA uses UCS-2 passed in a 4 byte unsigned int */ +typedef ac_uint4 ldap_unicode_t; /* Convert a string with csize octets per character to UTF-8 */ LDAP_F( int ) ldap_ucs_to_utf8s LDAP_P(( diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c index ba67c1fed4..d1801f898d 100644 --- a/servers/slapd/acl.c +++ b/servers/slapd/acl.c @@ -387,7 +387,6 @@ access_allowed_mask( char accessmaskbuf[ACCESSMASK_MAXLEN]; #endif slap_mask_t mask; - slap_control_t control; slap_access_t access_level; const char *attr; int st_same_attr = 0; @@ -483,14 +482,12 @@ access_allowed_mask( e->e_dn, attr, 0 ); ACL_INIT( mask ); - } else if ( control == ACL_BREAK ) { + } else { Debug( LDAP_DEBUG_ACL, "=> access_allowed: no more rules\n", 0, 0, 0 ); goto done; } - - ret = ACL_GRANT( mask, access ); } Debug( LDAP_DEBUG_ACL, diff --git a/servers/slapd/back-sql/back-sql.h b/servers/slapd/back-sql/back-sql.h index 78ca48e791..0bbb0e1499 100644 --- a/servers/slapd/back-sql/back-sql.h +++ b/servers/slapd/back-sql/back-sql.h @@ -223,11 +223,9 @@ typedef struct { #undef BACKSQL_ARBITRARY_KEY /* - * define to enable experimental support for syncporv overlay + * define to enable support for syncprov overlay */ -#ifdef LDAP_DEVEL #define BACKSQL_SYNCPROV -#endif /* LDAP_DEVEL */ /* * define to the appropriate aliasing string diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c index e100b60022..0a5934214c 100644 --- a/servers/slapd/backend.c +++ b/servers/slapd/backend.c @@ -196,7 +196,7 @@ int backend_startup_one(Backend *be) assert( be != NULL ); be->be_pending_csn_list = (struct be_pcl *) - ch_calloc( 1, sizeof( struct be_pcl )); + ch_calloc( 1, sizeof( struct be_pcl ) ); LDAP_TAILQ_INIT( be->be_pending_csn_list ); diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c index becbd71310..4025e40b37 100644 --- a/servers/slapd/modify.c +++ b/servers/slapd/modify.c @@ -90,7 +90,7 @@ do_modify( tmp.sml_nvalues = NULL; - if ( ber_scanf( op->o_ber, "{i{m[W]}}", &mop, + if ( ber_scanf( op->o_ber, "{e{m[W]}}", &mop, &tmp.sml_type, &tmp.sml_values ) == LBER_ERROR ) { send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, @@ -344,13 +344,11 @@ fe_op_modify( Operation *op, SlapReply *rs ) goto cleanup; } - { - rs->sr_err = slap_mods_obsolete_check( op, modlist, - &rs->sr_text, textbuf, textlen ); - if ( rs->sr_err != LDAP_SUCCESS ) { - send_ldap_result( op, rs ); - goto cleanup; - } + rs->sr_err = slap_mods_obsolete_check( op, modlist, + &rs->sr_text, textbuf, textlen ); + if ( rs->sr_err != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); + goto cleanup; } /* check for modify/increment support */ diff --git a/servers/slapd/result.c b/servers/slapd/result.c index 081eae7b0e..d1e79bf339 100644 --- a/servers/slapd/result.c +++ b/servers/slapd/result.c @@ -266,7 +266,7 @@ send_ldap_controls( Operation *o, BerElement *ber, LDAPControl **c ) ber_init2( sber, NULL, LBER_USE_DER ); - ber_printf( sber, "{i}", LDAP_UNWILLING_TO_PERFORM ); + ber_printf( sber, "{e}", LDAP_UNWILLING_TO_PERFORM ); if( ber_flatten2( ber, &sorted.ldctl_value, 0 ) == -1 ) { return -1; diff --git a/tests/data/slapd-glue-ldap.conf b/tests/data/slapd-glue-ldap.conf index 41220ab8d9..e8a3f3e483 100644 --- a/tests/data/slapd-glue-ldap.conf +++ b/tests/data/slapd-glue-ldap.conf @@ -32,6 +32,8 @@ argsfile ./test-db/slapd.m.args #metamod#moduleload back_meta.la #monitormod#modulepath ../servers/slapd/back-monitor/ #monitormod#moduleload back_monitor.la +#gluemod#modulepath ../servers/slapd/overlays/ +#gluemod#moduleload glue.la #rwmmod#modulepath ../servers/slapd/overlays/ #rwmmod#moduleload rwm.la -- 2.39.5