X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Facl.c;h=c648d4ef6fb6dcabf90ac232bfe29f5b718c7231;hb=0a5f1e8516d386784ed7f605e5d03c7ee6d7cedd;hp=17f4459e00b502bebe73bf1bc57ea28532f7651a;hpb=1240c70ff4aceb57e99a2bd3b64a514053eeeb77;p=openldap diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c index 17f4459e00..c648d4ef6f 100644 --- a/servers/slapd/acl.c +++ b/servers/slapd/acl.c @@ -1,8 +1,27 @@ /* acl.c - routines to parse and check acl's */ /* $OpenLDAP$ */ -/* - * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2003 The OpenLDAP Foundation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* Portions Copyright (c) 1995 Regents of the University of Michigan. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that this notice is preserved and that due credit is given + * to the University of Michigan at Ann Arbor. The name of the University + * may not be used to endorse or promote products derived from this + * software without specific prior written permission. This software + * is provided ``as is'' without express or implied warranty. */ #include "portable.h" @@ -178,8 +197,8 @@ access_allowed( } #ifdef LDAP_SLAPI - ret = slapi_x_access_allowed( op, e, desc, val, access, state ); - if ( ret == 0 ) { + if ( op->o_pb && + !slapi_x_access_allowed( op, e, desc, val, access, state )) { /* ACL plugin denied access */ goto done; }