mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-23 14:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Additional changes from devel

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-06-17 20:07:51 +00:00
parent e3a22ab086
commit 30bd8478cc
4 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/openldap.m4
View File

@ -731,7 +731,7 @@ dnl defines ol_cv_sys_linux_threads to 'yes' or 'no'
dnl 'no' implies pthreads implementation is not LinuxThreads.
dnl
AC_DEFUN([OL_SYS_LINUX_THREADS], [
AC_CHECK_FUNC(pthread_kill_other_threads_np)
AC_CHECK_FUNCS(pthread_kill_other_threads_np)
AC_CACHE_CHECK([for LinuxThreads implementation],
[ol_cv_sys_linux_threads],
[ol_cv_sys_linux_threads=$ac_cv_func_pthread_kill_other_threads_np])

3
include/portable.h.in
View File

@ -212,6 +212,9 @@
/* Define if you have the pthread_kill function. */
#undef HAVE_PTHREAD_KILL
/* Define if you have the pthread_kill_other_threads_np function. */
#undef HAVE_PTHREAD_KILL_OTHER_THREADS_NP
/* Define if you have the pthread_rwlock_destroy function. */
#undef HAVE_PTHREAD_RWLOCK_DESTROY

4
libraries/libldap_r/thr_posix.c
View File

@ -41,6 +41,10 @@ ldap_int_thread_initialize( void )
int
ldap_int_thread_destroy( void )
{
#ifdef HAVE_PTHREAD_KILL_OTHER_THREADS_NP
/* LinuxThreads: kill clones */
pthread_kill_other_threads_np();
#endif
return 0;
}

50
servers/slapd/acl.c
View File

@ -532,7 +532,7 @@ acl_mask(
if ( b->a_dn_at != NULL && op->o_ndn != NULL ) {
Attribute *at;
struct berval bv;
int match = 0;
int rc, match = 0;
const char *text;
const char *desc = b->a_dn_at->ad_cname->bv_val;
@ -555,21 +555,41 @@ acl_mask(
}
if( match ) {
if ( b->a_dn_self && (val == NULL
|| value_match( &match, b->a_dn_at,
b->a_dn_at->ad_type->sat_equality, val, &bv, &text ) )
!= LDAP_SUCCESS
|| match )
{
continue;
/* have a dnattr match. if this is a self clause then
* the target must also match the op dn.
*/
if ( b->a_dn_self ) {
/* check if the target is an attribute. */
if ( val == NULL )
continue;
/* target is attribute, check if the attribute value
* is the op dn.
*/
rc = value_match( &match, b->a_dn_at,
b->a_dn_at->ad_type->sat_equality,
val, &bv, &text );
/* on match error or no match, fail the ACL clause */
if (rc != LDAP_SUCCESS || match != 0 )
continue;
}
} else if ( ! b->a_dn_self || val == NULL
|| value_match( &match, b->a_dn_at,
b->a_dn_at->ad_type->sat_equality, val, &bv, &text )
!= LDAP_SUCCESS
|| match )
{
continue;
} else {
/* no dnattr match, check if this is a self clause */
if ( ! b->a_dn_self )
continue;
/* this is a self clause, check if the target is an
* attribute.
*/
if ( val == NULL )
continue;
/* target is attribute, check if the attribute value
* is the op dn.
*/
rc = value_match( &match, b->a_dn_at,
b->a_dn_at->ad_type->sat_equality,
val, &bv, &text );
/* on match error or no match, fail the ACL clause */
if (rc != LDAP_SUCCESS || match != 0 )
continue;
}
}