#include <ac/string.h>
#include "slap.h"
+#include "sets.h"
static AccessControl * acl_get(
AccessControl *ac, int *count,
Backend *be, Operation *op,
Entry *e,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *desc,
-#else
- const char *desc,
-#endif
int nmatches, regmatch_t *matches );
static slap_control_t acl_mask(
- AccessControl *ac, slap_access_mask_t *mask,
+ AccessControl *ac, slap_mask_t *mask,
Backend *be, Connection *conn, Operation *op,
Entry *e,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *desc,
-#else
- const char *desc,
-#endif
struct berval *val,
regmatch_t *matches );
#ifdef SLAPD_ACI_ENABLED
static int aci_mask(
Backend *be,
+ Connection *conn,
Operation *op,
Entry *e,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *desc,
-#else
- const char *desc,
-#endif
struct berval *val,
struct berval *aci,
regmatch_t *matches,
slap_access_t *grant,
slap_access_t *deny );
-
-char *supportedACIMechs[] = {
- "1.3.6.1.4.1.4203.666.7.1", /* experimental IETF aci family */
- "1.3.6.1.4.1.4203.666.7.2", /* experimental OpenLDAP aci family */
- NULL
-};
#endif
static int regex_matches(
char *newbuf, int bufsiz, char *pattern,
char *match, regmatch_t *matches);
+char **aci_set_gather (void *cookie, char *name, char *attr);
+static int aci_match_set ( struct berval *subj, Backend *be,
+ Entry *e, Connection *conn, Operation *op, int setref );
/*
* access_allowed - check whether op->o_ndn is allowed the requested access
Connection *conn,
Operation *op,
Entry *e,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *desc,
-#else
- const char *desc,
-#endif
struct berval *val,
slap_access_t access )
{
#ifdef LDAP_DEBUG
char accessmaskbuf[ACCESSMASK_MAXLEN];
#endif
- slap_access_mask_t mask;
+ slap_mask_t mask;
slap_control_t control;
+ const char *attr;
+ regmatch_t matches[MAXREMATCHES];
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- const char *attr = desc ? desc->ad_cname->bv_val : NULL;
-#else
- const char *attr = desc;
-#endif
+ assert( e != NULL );
+ assert( desc != NULL );
+ assert( access > ACL_NONE );
- regmatch_t matches[MAXREMATCHES];
+ attr = desc->ad_cname->bv_val;
+ assert( attr != NULL );
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
+ "access_allowed: conn %d %s access to \"%s\" \"%s\" requested\n",
+ conn->c_connid, access2str( access ), e->e_dn, attr ));
+#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: %s access to \"%s\" \"%s\" requested\n",
access2str( access ),
e->e_dn, attr );
+#endif
+ if ( op == NULL ) {
+ /* no-op call */
+ return 1;
+ }
+
+ if ( be == NULL ) be = &backends[0];
assert( be != NULL );
- assert( e != NULL );
- assert( attr != NULL );
- assert( access > ACL_NONE );
/* grant database root access */
if ( be != NULL && be_isroot( be, op->o_ndn ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
+ "access_allowed: conn %d root access granted\n",
+ conn->c_connid));
+#else
Debug( LDAP_DEBUG_ACL,
"<= root access granted\n",
0, 0, 0 );
+#endif
return 1;
}
* by ACL_WRITE checking as any found here are not provided
* by the user
*/
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if ( access >= ACL_WRITE && is_at_no_user_mod( desc->ad_type ) )
-#else
- if ( access >= ACL_WRITE && oc_check_op_no_usermod_attr( attr ) )
-#endif
+ if ( access >= ACL_WRITE && is_at_no_user_mod( desc->ad_type )
+ && desc != slap_schema.si_ad_entry
+ && desc != slap_schema.si_ad_children )
{
- Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:"
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "access_allowed: conn %d NoUserMod Operational attribute: %s access granted\n",
+ conn->c_connid, attr ));
+#else
+ Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:"
" %s access granted\n",
attr, 0, 0 );
+#endif
return 1;
}
/* use backend default access if no backend acls */
if( be != NULL && be->be_acl == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "access_allowed: conn %d backend default %s access %s to \"%s\"\n",
+ conn->c_connid, access2str( access ),
+ be->be_dfltaccess >= access ? "granted" : "denied", op->o_dn ));
+#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: backend default %s access %s to \"%s\"\n",
access2str( access ),
be->be_dfltaccess >= access ? "granted" : "denied", op->o_dn );
-
+#endif
return be->be_dfltaccess >= access;
#ifdef notdef
/* be is always non-NULL */
/* use global default access if no global acls */
} else if ( be == NULL && global_acl == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "access_allowed: conn %d global default %s access %s to \"%s\"\n",
+ conn->c_connid, access2str( access ),
+ global_default_access >= access ? "granted" : "denied", op->o_dn ));
+#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: global default %s access %s to \"%s\"\n",
access2str( access ),
global_default_access >= access ? "granted" : "denied", op->o_dn );
-
+#endif
return global_default_access >= access;
#endif
}
ACL_INIT(mask);
- memset(matches, 0, sizeof(matches));
+ memset(matches, '\0', sizeof(matches));
control = ACL_BREAK;
a = NULL;
count = 0;
- while( a = acl_get( a, &count, be, op, e, desc, MAXREMATCHES, matches ) )
+ while((a = acl_get( a, &count, be, op, e, desc, MAXREMATCHES, matches )) != NULL)
{
int i;
for (i = 0; i < MAXREMATCHES && matches[i].rm_so > 0; i++) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "access_allowed: conn %d match[%d]: %d %d ",
+ conn->c_connid, i, (int)matches[i].rm_so, (int)matches[i].rm_eo ));
+#else
Debug( LDAP_DEBUG_ACL, "=> match[%d]: %d %d ", i,
(int)matches[i].rm_so, (int)matches[i].rm_eo );
-
+#endif
if( matches[i].rm_so <= matches[0].rm_eo ) {
int n;
for ( n = matches[i].rm_so; n < matches[i].rm_eo; n++) {
Debug( LDAP_DEBUG_ACL, "%c", e->e_ndn[n], 0, 0 );
}
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_ARGS, "\n" ));
+#else
Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 );
+#endif
}
control = acl_mask( a, &mask, be, conn, op,
break;
}
- memset(matches, 0, sizeof(matches));
+ memset(matches, '\0', sizeof(matches));
}
if ( ACL_IS_INVALID( mask ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "access_allowed: conn %d \"%s\" (%s) invalid!\n",
+ conn->c_connid, e->e_dn, attr ));
+#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: \"%s\" (%s) invalid!\n",
e->e_dn, attr, 0 );
+#endif
ACL_INIT( mask );
} else if ( control == ACL_BREAK ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "access_allowed: conn %d no more rules\n", conn->c_connid ));
+#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: no more rules\n", 0, 0, 0);
+#endif
ACL_INIT( mask );
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
+ "access_allowed: conn %d %s access %s by %s\n",
+ conn->c_connid,
+ access2str( access ),
+ ACL_GRANT( mask, access ) ? "granted" : "denied",
+ accessmask2str( mask, accessmaskbuf ) ));
+#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: %s access %s by %s\n",
access2str( access ),
ACL_GRANT(mask, access) ? "granted" : "denied",
accessmask2str( mask, accessmaskbuf ) );
-
+#endif
return ACL_GRANT(mask, access);
}
Backend *be,
Operation *op,
Entry *e,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *desc,
-#else
- const char *desc,
-#endif
int nmatch,
regmatch_t *matches )
{
const char *attr;
+ int dnlen, patlen;
+
assert( e != NULL );
assert( count != NULL );
+ assert( desc != NULL );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- attr = desc ? desc->ad_cname->bv_val : NULL;
-#else
- attr = desc;
-#endif
+ attr = desc->ad_cname->bv_val;
+
+ assert( attr != NULL );
if( a == NULL ) {
if( be == NULL ) {
a = a->acl_next;
}
+ dnlen = strlen(e->e_ndn);
+
for ( ; a != NULL; a = a->acl_next ) {
(*count) ++;
if (a->acl_dn_pat != NULL) {
- Debug( LDAP_DEBUG_ACL, "=> dnpat: [%d] %s nsub: %d\n",
- *count, a->acl_dn_pat, (int) a->acl_dn_re.re_nsub );
-
- if (regexec(&a->acl_dn_re, e->e_ndn, nmatch, matches, 0)) {
- continue;
+ if ( a->acl_dn_style == ACL_STYLE_REGEX ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_get: dnpat [%d] %s nsub: %d\n",
+ *count, a->acl_dn_pat, (int) a->acl_dn_re.re_nsub ));
+#else
+ Debug( LDAP_DEBUG_ACL, "=> dnpat: [%d] %s nsub: %d\n",
+ *count, a->acl_dn_pat, (int) a->acl_dn_re.re_nsub );
+#endif
+ if (regexec(&a->acl_dn_re, e->e_ndn, nmatch, matches, 0))
+ continue;
} else {
- Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] matched\n",
- *count, 0, 0);
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_get: dn [%d] %s\n",
+ *count, a->acl_dn_pat ));
+#else
+ Debug( LDAP_DEBUG_ACL, "=> dn: [%d] %s\n",
+ *count, a->acl_dn_pat, 0 );
+#endif
+ patlen = strlen( a->acl_dn_pat );
+ if ( dnlen < patlen )
+ continue;
+
+ if ( a->acl_dn_style == ACL_STYLE_BASE ) {
+ /* base dn -- entire object DN must match */
+ if ( dnlen != patlen )
+ continue;
+
+ } else if ( a->acl_dn_style == ACL_STYLE_ONE ) {
+ char *rdn;
+ int rdnlen = -1;
+
+ if ( dnlen <= patlen )
+ continue;
+
+ if ( e->e_ndn[dnlen - patlen - 1] != ',' )
+ continue;
+
+ rdn = dn_rdn( NULL, e->e_ndn );
+ if ( rdn != NULL ) {
+ rdnlen = strlen( rdn );
+ ch_free( rdn );
+ }
+ if ( rdnlen != dnlen - patlen - 1 )
+ continue;
+
+ } else if ( a->acl_dn_style == ACL_STYLE_SUBTREE ) {
+ if ( dnlen > patlen && e->e_ndn[dnlen - patlen - 1] != ',' )
+ continue;
+
+ } else if ( a->acl_dn_style == ACL_STYLE_CHILDREN ) {
+ if ( dnlen <= patlen )
+ continue;
+ if ( e->e_ndn[dnlen - patlen - 1] != ',' )
+ continue;
+ }
+
+ if ( strcmp( a->acl_dn_pat, e->e_ndn + dnlen - patlen ) != 0 )
+ continue;
}
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_get: [%d] matched\n",
+ *count ));
+#else
+ Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] matched\n",
+ *count, 0, 0 );
+#endif
}
if ( a->acl_filter != NULL ) {
}
}
- Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] check attr %s\n",
- *count, attr, 0);
-
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_get: [%d] check attr %s\n",
+ *count, attr ));
+#else
+ Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] check attr %s\n",
+ *count, attr, 0);
+#endif
if ( attr == NULL || a->acl_attrs == NULL ||
ad_inlist( desc, a->acl_attrs ) )
{
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_get: [%d] acl %s attr: %s\n",
+ *count, e->e_dn, attr ));
+#else
Debug( LDAP_DEBUG_ACL,
"<= acl_get: [%d] acl %s attr: %s\n",
*count, e->e_dn, attr );
+#endif
return a;
}
matches[0].rm_so = matches[0].rm_eo = -1;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
+ "acl_get: done.\n" ));
+#else
Debug( LDAP_DEBUG_ACL, "<= acl_get: done.\n", 0, 0, 0 );
+#endif
return( NULL );
}
static slap_control_t
acl_mask(
AccessControl *a,
- slap_access_mask_t *mask,
+ slap_mask_t *mask,
Backend *be,
Connection *conn,
Operation *op,
Entry *e,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *desc,
-#else
- const char *desc,
-#endif
struct berval *val,
regmatch_t *matches
)
{
- int i;
+ int i, odnlen, patlen;
Access *b;
#ifdef LDAP_DEBUG
char accessmaskbuf[ACCESSMASK_MAXLEN];
#endif
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- const char *attr = desc ? desc->ad_cname->bv_val : NULL;
-#else
- const char *attr = desc;
-#endif
+ const char *attr;
assert( a != NULL );
assert( mask != NULL );
+ assert( desc != NULL );
+ attr = desc->ad_cname->bv_val;
+
+ assert( attr != NULL );
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
+ "acl_mask: conn %d access to entry \"%s\", attr \"%s\" requested\n",
+ conn->c_connid, e->e_dn, attr ));
+
+ LDAP_LOG(( "acl", LDAP_LEVEL_ARGS,
+ " to %s by \"%s\", (%s) \n",
+ val ? "value" : "all values",
+ op->o_ndn ? op->o_ndn : "",
+ accessmask2str( *mask, accessmaskbuf ) ));
+#else
Debug( LDAP_DEBUG_ACL,
"=> acl_mask: access to entry \"%s\", attr \"%s\" requested\n",
e->e_dn, attr, 0 );
Debug( LDAP_DEBUG_ACL,
- "=> acl_mask: to value \"%s\" by \"%s\", (%s) \n",
- val ? val->bv_val : "*",
+ "=> acl_mask: to %s by \"%s\", (%s) \n",
+ val ? "value" : "all values",
op->o_ndn ? op->o_ndn : "",
accessmask2str( *mask, accessmaskbuf ) );
+#endif
for ( i = 1, b = a->acl_access; b != NULL; b = b->a_next, i++ ) {
- slap_access_mask_t oldmask, modmask;
+ slap_mask_t oldmask, modmask;
ACL_INVALIDATE( modmask );
/* AND <who> clauses */
if ( b->a_dn_pat != NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_dn_pat: %s\n",
+ conn->c_connid, b->a_dn_pat ));
+#else
Debug( LDAP_DEBUG_ACL, "<= check a_dn_pat: %s\n",
b->a_dn_pat, 0, 0);
+#endif
/*
* if access applies to the entry itself, and the
* user is bound as somebody in the same namespace as
continue;
}
- } else if ( strcmp( b->a_dn_pat, "*" ) != 0 ) {
- int ret = regex_matches( b->a_dn_pat,
- op->o_ndn, e->e_ndn, matches );
+ } else if ( b->a_dn_style == ACL_STYLE_REGEX ) {
+ if ( strcmp( b->a_dn_pat, "*" ) != 0 ) {
+ int ret = regex_matches( b->a_dn_pat,
+ op->o_ndn, e->e_ndn, matches );
- if( ret == 0 ) {
+ if( ret == 0 ) {
+ continue;
+ }
+ }
+
+ } else {
+ if ( e->e_dn == NULL )
continue;
+
+ patlen = strlen( b->a_dn_pat );
+ odnlen = strlen( op->o_ndn );
+ if ( odnlen < patlen )
+ continue;
+
+ if ( b->a_dn_style == ACL_STYLE_BASE ) {
+ /* base dn -- entire object DN must match */
+ if ( odnlen != patlen )
+ continue;
+
+ } else if ( b->a_dn_style == ACL_STYLE_ONE ) {
+ char *rdn;
+ int rdnlen = -1;
+
+ if ( odnlen <= patlen )
+ continue;
+
+ if ( op->o_ndn[odnlen - patlen - 1] != ',' )
+ continue;
+
+ rdn = dn_rdn( NULL, op->o_ndn );
+ if ( rdn != NULL ) {
+ rdnlen = strlen( rdn );
+ ch_free( rdn );
+ }
+ if ( rdnlen != odnlen - patlen - 1 )
+ continue;
+
+ } else if ( b->a_dn_style == ACL_STYLE_SUBTREE ) {
+ if ( odnlen > patlen && op->o_ndn[odnlen - patlen - 1] != ',' )
+ continue;
+
+ } else if ( b->a_dn_style == ACL_STYLE_CHILDREN ) {
+ if ( odnlen <= patlen )
+ continue;
+ if ( op->o_ndn[odnlen - patlen - 1] != ',' )
+ continue;
}
+
+ if ( strcmp( b->a_dn_pat, op->o_ndn + odnlen - patlen ) != 0 )
+ continue;
+
}
}
if ( b->a_sockurl_pat != NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_sockurl_pat: %s\n",
+ conn->c_connid, b->a_sockurl_pat ));
+#else
Debug( LDAP_DEBUG_ACL, "<= check a_sockurl_pat: %s\n",
b->a_sockurl_pat, 0, 0 );
+#endif
- if ( strcmp( b->a_sockurl_pat, "*" ) != 0 &&
- !regex_matches( b->a_sockurl_pat, conn->c_listener_url,
- e->e_ndn, matches ) )
- {
- continue;
+ if ( strcmp( b->a_sockurl_pat, "*" ) != 0) {
+ if ( b->a_sockurl_style == ACL_STYLE_REGEX) {
+ if (!regex_matches( b->a_sockurl_pat, conn->c_listener_url,
+ e->e_ndn, matches ) )
+ {
+ continue;
+ }
+ } else {
+ if ( strcasecmp( b->a_sockurl_pat, conn->c_listener_url ) == 0 )
+ continue;
+ }
}
}
if ( b->a_domain_pat != NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_domain_pat: %s\n",
+ conn->c_connid, b->a_domain_pat ));
+#else
Debug( LDAP_DEBUG_ACL, "<= check a_domain_pat: %s\n",
b->a_domain_pat, 0, 0 );
-
- if ( strcmp( b->a_domain_pat, "*" ) != 0 &&
- !regex_matches( b->a_domain_pat, conn->c_peer_domain,
- e->e_ndn, matches ) )
- {
- continue;
+#endif
+ if ( strcmp( b->a_domain_pat, "*" ) != 0) {
+ if ( b->a_domain_style == ACL_STYLE_REGEX) {
+ if (!regex_matches( b->a_domain_pat, conn->c_peer_domain,
+ e->e_ndn, matches ) )
+ {
+ continue;
+ }
+ } else {
+ if ( strcasecmp( b->a_domain_pat, conn->c_peer_domain ) == 0 )
+ continue;
+ }
}
}
if ( b->a_peername_pat != NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_perrname_path: %s\n",
+ conn->c_connid, b->a_peername_pat ));
+#else
Debug( LDAP_DEBUG_ACL, "<= check a_peername_path: %s\n",
b->a_peername_pat, 0, 0 );
-
- if ( strcmp( b->a_peername_pat, "*" ) != 0 &&
- !regex_matches( b->a_peername_pat, conn->c_peer_name,
- e->e_ndn, matches ) )
- {
- continue;
+#endif
+ if ( strcmp( b->a_peername_pat, "*" ) != 0) {
+ if ( b->a_peername_style == ACL_STYLE_REGEX) {
+ if (!regex_matches( b->a_peername_pat, conn->c_peer_name,
+ e->e_ndn, matches ) )
+ {
+ continue;
+ }
+ } else {
+ if ( strcasecmp( b->a_peername_pat, conn->c_peer_name ) == 0 )
+ continue;
+ }
}
}
if ( b->a_sockname_pat != NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_sockname_path: %s\n",
+ conn->c_connid, b->a_sockname_pat ));
+#else
Debug( LDAP_DEBUG_ACL, "<= check a_sockname_path: %s\n",
b->a_sockname_pat, 0, 0 );
-
- if ( strcmp( b->a_sockname_pat, "*" ) != 0 &&
- !regex_matches( b->a_sockname_pat, conn->c_sock_name,
- e->e_ndn, matches ) )
- {
- continue;
+#endif
+ if ( strcmp( b->a_sockname_pat, "*" ) != 0) {
+ if ( b->a_sockname_style == ACL_STYLE_REGEX) {
+ if (!regex_matches( b->a_sockname_pat, conn->c_sock_name,
+ e->e_ndn, matches ) )
+ {
+ continue;
+ }
+ } else {
+ if ( strcasecmp( b->a_sockname_pat, conn->c_sock_name ) == 0 )
+ continue;
+ }
}
}
if ( b->a_dn_at != NULL && op->o_ndn != NULL ) {
Attribute *at;
struct berval bv;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- int match;
+ int rc, match = 0;
const char *text;
-#endif
+ const char *attr = b->a_dn_at->ad_cname->bv_val;
- Debug( LDAP_DEBUG_ACL, "<= check a_dn_at: %s\n",
- b->a_dn_at, 0, 0);
+ assert( attr != NULL );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_dn_pat: %s\n",
+ conn->c_connid, attr ));
+#else
+ Debug( LDAP_DEBUG_ACL, "<= check a_dn_at: %s\n",
+ attr, 0, 0);
+#endif
bv.bv_val = op->o_ndn;
bv.bv_len = strlen( bv.bv_val );
/* see if asker is listed in dnattr */
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
for( at = attrs_find( e->e_attrs, b->a_dn_at );
- at == NULL;
- at = attrs_find( e->e_attrs->a_next, b->a_dn_at ) )
+ at != NULL;
+ at = attrs_find( at->a_next, b->a_dn_at ) )
{
if( value_find( b->a_dn_at, at->a_vals, &bv ) == 0 ) {
/* found it */
}
if( match ) {
- if ( b->a_dn_self && (val == NULL
- || value_match( &match, b->a_dn_at,
- b->a_dn_at->ad_type->sat_equality, &bv, val, &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, 0,
+ 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, &bv, val, &text )
- != LDAP_SUCCESS
- || match )
- {
- continue;
- }
-#else
- /* see if asker is listed in dnattr */
- if ( (at = attr_find( e->e_attrs, b->a_dn_at )) != NULL &&
- value_find( at->a_vals, &bv, at->a_syntax, 3 ) == 0 )
- {
- if ( b->a_dn_self && (val == NULL
- || value_cmp( &bv, val, at->a_syntax, 2 ) ) )
- {
+ } 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, 0,
+ val, &bv, &text );
- /* asker not listed in dnattr - check for self access */
- } else if ( ! b->a_dn_self || val == NULL
- || value_cmp( &bv, val, at->a_syntax, 2 ) != 0 )
- {
- continue;
+ /* on match error or no match, fail the ACL clause */
+ if (rc != LDAP_SUCCESS || match != 0 )
+ continue;
}
-#endif
}
if ( b->a_group_pat != NULL && op->o_ndn != NULL ) {
* the values in the attribute group
*/
/* see if asker is listed in dnattr */
- string_expand(buf, sizeof(buf), b->a_group_pat, e->e_ndn, matches);
- if ( dn_normalize(buf) == NULL ) {
- /* did not expand to a valid dn */
- continue;
+ if ( b->a_group_style == ACL_STYLE_REGEX ) {
+ string_expand(buf, sizeof(buf), b->a_group_pat, e->e_ndn, matches);
+ if ( dn_normalize(buf) == NULL ) {
+ /* did not expand to a valid dn */
+ continue;
+ }
+ } else {
+ strncpy( buf, b->a_group_pat, sizeof(buf) - 1 );
+ buf[sizeof(buf) - 1] = 0;
}
- if (backend_group(be, e, buf, op->o_ndn,
+ if (backend_group(be, conn, op, e, buf, op->o_ndn,
b->a_group_oc, b->a_group_at) != 0)
{
continue;
}
}
+ if ( b->a_set_pat != NULL ) {
+ struct berval bv;
+
+ bv.bv_val = b->a_set_pat;
+ bv.bv_len = strlen(b->a_set_pat);
+ if (aci_match_set( &bv, be, e, conn, op, 0 ) == 0) {
+ continue;
+ }
+ }
+
+ if ( b->a_authz.sai_ssf ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_authz.sai_ssf: ACL %u > OP %u\n",
+ conn->c_connid, b->a_authz.sai_ssf, op->o_ssf ));
+#else
+ Debug( LDAP_DEBUG_ACL, "<= check a_authz.sai_ssf: ACL %u > OP %u\n",
+ b->a_authz.sai_ssf, op->o_ssf, 0 );
+#endif
+ if ( b->a_authz.sai_ssf > op->o_ssf ) {
+ continue;
+ }
+ }
+
+ if ( b->a_authz.sai_transport_ssf ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
+ conn->c_connid, b->a_authz.sai_transport_ssf, op->o_transport_ssf ));
+#else
+ Debug( LDAP_DEBUG_ACL,
+ "<= check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
+ b->a_authz.sai_transport_ssf, op->o_transport_ssf, 0 );
+#endif
+ if ( b->a_authz.sai_transport_ssf > op->o_transport_ssf ) {
+ continue;
+ }
+ }
+
+ if ( b->a_authz.sai_tls_ssf ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_authz.sai_tls_ssf: ACL %u > OP %u\n",
+ conn->c_connid, b->a_authz.sai_tls_ssf, op->o_tls_ssf ));
+#else
+ Debug( LDAP_DEBUG_ACL,
+ "<= check a_authz.sai_tls_ssf: ACL %u > OP %u\n",
+ b->a_authz.sai_tls_ssf, op->o_tls_ssf, 0 );
+#endif
+ if ( b->a_authz.sai_tls_ssf > op->o_tls_ssf ) {
+ continue;
+ }
+ }
+
+ if ( b->a_authz.sai_sasl_ssf ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d check a_authz.sai_sasl_ssf: ACL %u > OP %u\n",
+ conn->c_connid, b->a_authz.sai_sasl_ssf, op->o_sasl_ssf ));
+#else
+ Debug( LDAP_DEBUG_ACL,
+ "<= check a_authz.sai_sasl_ssf: ACL %u > OP %u\n",
+ b->a_authz.sai_sasl_ssf, op->o_sasl_ssf, 0 );
+#endif
+ if ( b->a_authz.sai_sasl_ssf > op->o_sasl_ssf ) {
+ continue;
+ }
+ }
+
#ifdef SLAPD_ACI_ENABLED
if ( b->a_aci_at != NULL ) {
Attribute *at;
/* this case works different from the others above.
* since aci's themselves give permissions, we need
- * to first check b->a_mask, the ACL's access level.
+ * to first check b->a_access_mask, the ACL's access level.
*/
if( op->o_ndn == NULL || op->o_ndn[0] == '\0' ) {
/* first check if the right being requested
* is allowed by the ACL clause.
*/
- if ( ! ACL_GRANT( b->a_mask, *mask ) ) {
+ if ( ! ACL_GRANT( b->a_access_mask, *mask ) ) {
continue;
}
* rights given by the acis.
*/
for ( i = 0; at->a_vals[i] != NULL; i++ ) {
- if (aci_mask( be, op,
- e, attr, val, at->a_vals[i],
+ if (aci_mask( be, conn, op,
+ e, desc, val, at->a_vals[i],
matches, &grant, &deny ) != 0)
{
tgrant |= grant;
}
/* remove anything that the ACL clause does not allow */
- tgrant &= b->a_mask & ACL_PRIV_MASK;
+ tgrant &= b->a_access_mask & ACL_PRIV_MASK;
tdeny &= ACL_PRIV_MASK;
/* see if we have anything to contribute */
* by clauses that return grant/deny pairs. Right now, it does either
* additive or subtractive rights, but not both at the same time. So,
* we need to combine the grant/deny pair into a single rights mask in
- * a smart way: if either grant or deny is "empty", then we use the
+ * a smart way: if either grant or deny is "empty", then we use the
* opposite as is, otherwise we remove any denied rights from the grant
* rights mask and construct an additive mask.
*/
} else
#endif
{
- modmask = b->a_mask;
+ modmask = b->a_access_mask;
}
-
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_RESULTS,
+ "acl_mask: conn %d [%d] applying %s (%s)\n",
+ conn->c_connid, i, accessmask2str( modmask, accessmaskbuf),
+ b->a_type == ACL_CONTINUE ? "continue" : b->a_type == ACL_BREAK
+ ? "break" : "stop" ));
+#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: [%d] applying %s (%s)\n",
i, accessmask2str( modmask, accessmaskbuf ),
: b->a_type == ACL_BREAK
? "break"
: "stop" );
-
+#endif
/* save old mask */
oldmask = *mask;
*mask = modmask;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
+ "acl_mask: conn %d [%d] mask: %s\n",
+ conn->c_connid, i, accessmask2str( *mask, accessmaskbuf) ));
+#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: [%d] mask: %s\n",
i, accessmask2str(*mask, accessmaskbuf), 0 );
+#endif
if( b->a_type == ACL_CONTINUE ) {
continue;
}
}
+ /* implicit "by * none" clause */
+ ACL_INIT(*mask);
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_RESULTS,
+ "acl_mask: conn %d no more <who> clauses, returning %d (stop)\n",
+ conn->c_connid, accessmask2str( *mask, accessmaskbuf) ));
+#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: no more <who> clauses, returning %s (stop)\n",
accessmask2str(*mask, accessmaskbuf), 0, 0 );
+#endif
return ACL_STOP;
}
/* short circuit root database access */
if ( be_isroot( be, op->o_ndn ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
+ "acl_check_modlist: conn %d access granted to root user\n",
+ conn->c_connid ));
+#else
Debug( LDAP_DEBUG_ACL,
"<= acl_access_allowed: granted to database root\n",
0, 0, 0 );
+#endif
return 1;
}
/* use backend default access if no backend acls */
if( be != NULL && be->be_acl == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
+ "acl_check_modlist: conn %d backend default %s access %s to \"%s\"\n",
+ conn->c_connid, access2str( ACL_WRITE ),
+ be->be_dfltaccess >= ACL_WRITE ? "granted" : "denied", op->o_dn ));
+#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: backend default %s access %s to \"%s\"\n",
access2str( ACL_WRITE ),
be->be_dfltaccess >= ACL_WRITE ? "granted" : "denied", op->o_dn );
-
+#endif
return be->be_dfltaccess >= ACL_WRITE;
#ifdef notdef
/* be is always non-NULL */
/* use global default access if no global acls */
} else if ( be == NULL && global_acl == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
+ "acl_check_modlist: conn %d global default %s access %s to \"%s\"\n",
+ conn->c_connid, access2str( ACL_WRITE ),
+ global_default_access >= ACL_WRITE ? "granted" : "denied", op->o_dn ));
+#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: global default %s access %s to \"%s\"\n",
access2str( ACL_WRITE ),
global_default_access >= ACL_WRITE ? "granted" : "denied", op->o_dn );
-
+#endif
return global_default_access >= ACL_WRITE;
#endif
}
* by ACL_WRITE checking as any found here are not provided
* by the user
*/
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
if ( is_at_no_user_mod( mlist->sml_desc->ad_type ) ) {
- Debug( LDAP_DEBUG_ACL, "acl: no-user-mod %s:"
- " modify access granted\n",
- mlist->sml_desc->ad_cname->bv_val, 0, 0 );
- continue;
- }
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
+ "acl_check_modlist: conn %d no-user-mod %s: modify access granted\n",
+ conn->c_connid, mlist->sml_desc->ad_cname->bv_val ));
#else
- if ( oc_check_op_no_usermod_attr( mlist->sml_type ) ) {
- Debug( LDAP_DEBUG_ACL, "acl: no-user-mod %s:"
+ Debug( LDAP_DEBUG_ACL, "acl: no-user-mod %s:"
" modify access granted\n",
- mlist->sml_type, 0, 0 );
+ mlist->sml_desc->ad_cname->bv_val, 0, 0 );
+#endif
continue;
}
-#endif
switch ( mlist->sml_op ) {
case LDAP_MOD_REPLACE:
return( 1 );
}
-#ifdef SLAPD_ACI_ENABLED
static char *
aci_bvstrdup( struct berval *bv )
{
s = (char *)ch_malloc(bv->bv_len + 1);
if (s != NULL) {
- memcpy(s, bv->bv_val, bv->bv_len);
+ AC_MEMCPY(s, bv->bv_val, bv->bv_len);
s[bv->bv_len] = 0;
}
return(s);
return(bv->bv_len);
}
+char **
+aci_set_gather (void *cookie, char *name, char *attr)
+{
+ struct {
+ Backend *be;
+ Entry *e;
+ Connection *conn;
+ Operation *op;
+ } *cp = (void *)cookie;
+ struct berval **bvals = NULL;
+ char **vals = NULL;
+ char *ndn;
+ int i;
+
+ /* this routine needs to return the bervals instead of
+ * plain strings, since syntax is not known. It should
+ * also return the syntax or some "comparison cookie".
+ */
+
+ if ((ndn = ch_strdup(name)) != NULL) {
+ if (dn_normalize(ndn) != NULL) {
+ const char *text;
+ AttributeDescription *desc = NULL;
+ if (slap_str2ad(attr, &desc, &text) == LDAP_SUCCESS) {
+ backend_attribute(cp->be, NULL /*cp->conn*/,
+ NULL /*cp->op*/, cp->e,
+ ndn, desc, &bvals);
+ if (bvals != NULL) {
+ for (i = 0; bvals[i] != NULL; i++) { }
+ vals = ch_calloc(i + 1, sizeof(char *));
+ if (vals != NULL) {
+ while (--i >= 0) {
+ vals[i] = bvals[i]->bv_val;
+ bvals[i]->bv_val = NULL;
+ }
+ }
+ ber_bvecfree(bvals);
+ }
+ ad_free(desc, 1);
+ }
+ }
+ ch_free(ndn);
+ }
+ return(vals);
+}
+
+static int
+aci_match_set (
+ struct berval *subj,
+ Backend *be,
+ Entry *e,
+ Connection *conn,
+ Operation *op,
+ int setref
+)
+{
+ char *set = NULL;
+ int rc = 0;
+ struct {
+ Backend *be;
+ Entry *e;
+ Connection *conn;
+ Operation *op;
+ } cookie;
+
+ if (setref == 0) {
+ set = aci_bvstrdup(subj);
+ } else {
+ struct berval bv;
+ char *subjdn;
+ char *setat;
+ struct berval **bvals;
+ const char *text;
+ AttributeDescription *desc = NULL;
+
+ /* format of string is "entry/setAttrName" */
+ if (aci_get_part(subj, 0, '/', &bv) < 0) {
+ return(0);
+ }
+
+ subjdn = aci_bvstrdup(&bv);
+ if ( subjdn == NULL ) {
+ return(0);
+ }
+
+ if ( aci_get_part(subj, 1, '/', &bv) < 0 ) {
+ setat = ch_strdup( SLAPD_ACI_SET_ATTR );
+ } else {
+ setat = aci_bvstrdup(&bv);
+ }
+ if ( setat != NULL ) {
+ if ( dn_normalize(subjdn) != NULL
+ && slap_str2ad(setat, &desc, &text) == LDAP_SUCCESS )
+ {
+ backend_attribute(be, NULL, NULL, e,
+ subjdn, desc, &bvals);
+ ad_free(desc, 1);
+ if ( bvals != NULL ) {
+ if ( bvals[0] != NULL )
+ set = ch_strdup(bvals[0]->bv_val);
+ ber_bvecfree(bvals);
+ }
+ }
+ ch_free(setat);
+ }
+ ch_free(subjdn);
+ }
+
+ if (set != NULL) {
+ cookie.be = be;
+ cookie.e = e;
+ cookie.conn = conn;
+ cookie.op = op;
+ rc = (set_filter(aci_set_gather, &cookie, set, op->o_ndn, e->e_ndn, NULL) > 0);
+ ch_free(set);
+ }
+ return(rc);
+}
+
+#ifdef SLAPD_ACI_ENABLED
static int
aci_list_map_rights(
struct berval *list )
const char *defgrpat,
Backend *be,
Entry *e,
+ Connection *conn,
Operation *op,
regmatch_t *matches
)
char *subjdn, *grpdn = NULL;
char *grpoc;
char *grpat;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
ObjectClass *grp_oc = NULL;
AttributeDescription *grp_ad = NULL;
char *text;
-#else
- char *grp_oc;
- char *grp_ad;
-#endif
int rc;
/* format of string is "group/objectClassValue/groupAttrName" */
grpat = aci_bvstrdup(&bv);
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
rc = slap_str2ad( grpat, &grp_ad, &text );
if( rc != LDAP_SUCCESS ) {
rc = 0;
goto done;
}
-#else
- grp_ad = grpat;
-#endif
rc = 0;
+ grp_oc = oc_find( grpoc );
grpdn = (char *)ch_malloc(1024);
if (grp_oc != NULL && grp_ad != NULL && grpdn != NULL) {
string_expand(grpdn, 1024, subjdn, e->e_ndn, matches);
if ( dn_normalize(grpdn) != NULL ) {
- rc = (backend_group(be, e, grpdn, op->o_ndn, grp_oc, grp_ad) == 0);
+ rc = (backend_group(be, conn, op, e, grpdn, op->o_ndn, grp_oc, grp_ad) == 0);
}
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
done:
if( grp_ad != NULL ) ad_free( grp_ad, 1 );
-#endif
ch_free(grpdn);
ch_free(grpat);
ch_free(grpoc);
static int
aci_mask(
Backend *be,
+ Connection *conn,
Operation *op,
Entry *e,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *desc,
-#else
- const char *attr,
-#endif
struct berval *val,
struct berval *aci,
regmatch_t *matches,
{
struct berval bv, perms, sdn;
char *subjdn;
- int rc, i;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- char *attr;
-#endif
+ int rc;
+ char *attr = desc->ad_cname->bv_val;
+
+ assert( attr != NULL );
/* parse an aci of the form:
oid#scope#action;rights;attr;rights;attr$action;rights;attr;rights;attr#dnType#subjectDN
/* check that the aci family is supported */
if (aci_get_part(aci, 0, '#', &bv) < 0)
return(0);
- for (i = 0; supportedACIMechs[i] != NULL; i++) {
- if (aci_strbvcmp( supportedACIMechs[i], &bv ) == 0)
- break;
- }
- if (supportedACIMechs[i] == NULL)
- return(0);
/* check that the scope is "entry" */
if (aci_get_part(aci, 1, '#', &bv) < 0
} else if (aci_strbvcmp( "dnattr", &bv ) == 0) {
char *dnattr = aci_bvstrdup(&sdn);
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
Attribute *at;
AttributeDescription *ad = NULL;
const char *text;
ad_free( ad, 1 );
return rc;
-#else
- Attribute *at;
- at = attr_find( e->e_attrs, dnattr );
- ch_free( dnattr );
-
- if (at != NULL) {
- bv.bv_val = op->o_ndn;
- bv.bv_len = strlen( bv.bv_val );
-
- if (value_find( at->a_vals, &bv, at->a_syntax, 3 ) == 0 )
- return(1);
- }
-#endif
} else if (aci_strbvcmp( "group", &bv ) == 0) {
- if (aci_group_member(&sdn, SLAPD_GROUP_CLASS, SLAPD_GROUP_ATTR, be, e, op, matches))
+ if (aci_group_member(&sdn, SLAPD_GROUP_CLASS, SLAPD_GROUP_ATTR, be, e, conn, op, matches))
return(1);
} else if (aci_strbvcmp( "role", &bv ) == 0) {
- if (aci_group_member(&sdn, SLAPD_ROLE_CLASS, SLAPD_ROLE_ATTR, be, e, op, matches))
+ if (aci_group_member(&sdn, SLAPD_ROLE_CLASS, SLAPD_ROLE_ATTR, be, e, conn, op, matches))
return(1);
+
+ } else if (aci_strbvcmp( "set", &bv ) == 0) {
+ if (aci_match_set(&sdn, be, e, conn, op, 0))
+ return(1);
+
+ } else if (aci_strbvcmp( "set-ref", &bv ) == 0) {
+ if (aci_match_set(&sdn, be, e, conn, op, 1))
+ return(1);
+
}
return(0);
}
-char *
-get_supported_acimech(
- int index )
-{
- if (index < 0 || index >= (sizeof(supportedACIMechs) / sizeof(char *)))
- return(NULL);
- return(supportedACIMechs[index]);
-}
-
#endif /* SLAPD_ACI_ENABLED */
static void
char *match,
regmatch_t *matches)
{
- int size;
+ int size;
char *sp;
char *dp;
- int flag;
+ int flag;
size = 0;
newbuf[0] = '\0';
*dp++ = '$';
size++;
} else if (*sp >= '0' && *sp <= '9' ) {
- int n;
- int i;
- int l;
+ int n;
+ int i;
+ int l;
n = *sp - '0';
*dp = '\0';
*dp = '\0';
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
+ "string_expand: pattern = %s\n", pat ));
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
+ "string_expand: expanded = %s\n", newbuf ));
+#else
Debug( LDAP_DEBUG_TRACE, "=> string_expand: pattern: %s\n", pat, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "=> string_expand: expanded: %s\n", newbuf, 0, 0 );
+#endif
}
static int
char error[512];
regerror(rc, &re, error, sizeof(error));
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "aci", LDAP_LEVEL_ERR,
+ "regex_matches: compile( \"%s\", \"%s\") failed %s\n",
+ pat, str, error ));
+#else
Debug( LDAP_DEBUG_TRACE,
"compile( \"%s\", \"%s\") failed %s\n",
pat, str, error );
+#endif
return( 0 );
}
rc = regexec(&re, str, 0, NULL, 0);
regfree( &re );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL2,
+ "regex_matches: string: %s\n", str ));
+ LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL2,
+ "regex_matches: rc: %d %s\n",
+ rc, rc ? "matches" : "no matches" ));
+#else
Debug( LDAP_DEBUG_TRACE,
- "=> regex_matches: string: %s\n", str, 0, 0 );
+ "=> regex_matches: string: %s\n", str, 0, 0 );
Debug( LDAP_DEBUG_TRACE,
"=> regex_matches: rc: %d %s\n",
rc, !rc ? "matches" : "no matches", 0 );
+#endif
return( !rc );
}