/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include "lutil.h"
static const char style_base[] = "base";
-char *style_strings[] = {
+const char *style_strings[] = {
"regex",
"expand",
"exact",
"users",
"self",
"ip",
+ "ipv6",
"path",
NULL
};
+#define ACLBUF_CHUNKSIZE 8192
+static struct berval aclbuf;
+
static void split(char *line, int splitchar, char **left, char **right);
static void access_append(Access **l, Access *a);
static void access_free( Access *a );
goto fail;
}
a = (AccessControl *) ch_calloc( 1, sizeof(AccessControl) );
+ a->acl_attrval_style = ACL_STYLE_NONE;
for ( ++i; i < argc; i++ ) {
if ( strcasecmp( argv[i], "by" ) == 0 ) {
i--;
if ( style != NULL ) {
if ( strcasecmp( style, "regex" ) == 0 ) {
int e = regcomp( &a->acl_attrval_re, bv.bv_val,
- REG_EXTENDED | REG_ICASE | REG_NOSUB );
+ REG_EXTENDED | REG_ICASE );
if ( e ) {
char err[SLAP_TEXT_BUFLEN],
buf[ SLAP_TEXT_BUFLEN ];
} else if ( strcasecmp( style, "ip" ) == 0 ) {
sty = ACL_STYLE_IP;
+ } else if ( strcasecmp( style, "ipv6" ) == 0 ) {
+#ifndef LDAP_PF_INET6
+ Debug( LDAP_DEBUG_ANY,
+ "%s: line %d: IPv6 not supported\n",
+ fname, lineno, 0 );
+#endif /* ! LDAP_PF_INET6 */
+ sty = ACL_STYLE_IPV6;
+
} else if ( strcasecmp( style, "path" ) == 0 ) {
sty = ACL_STYLE_PATH;
#ifndef LDAP_PF_LOCAL
}
}
- /* expand in <who> needs regex in <what> */
- if ( ( sty == ACL_STYLE_EXPAND || expand )
- && a->acl_dn_style != ACL_STYLE_REGEX )
- {
- Debug( LDAP_DEBUG_CONFIG | LDAP_DEBUG_ACL, "%s: line %d: \"expand\" style "
- "or modifier used in conjunction with a non-regex <what> clause.\n",
- fname, lineno, 0 );
- goto fail;
- }
-
if ( strncasecmp( left, "real", STRLENOF( "real" ) ) == 0 ) {
is_realdn = 1;
bdn = &b->a_realdn;
< bdn->a_pat.bv_len;
exp = strchr( exp, '$' ) )
{
- if ( isdigit( (unsigned char) exp[ 1 ] ) ) {
+ if ( ( isdigit( (unsigned char) exp[ 1 ] ) ||
+ exp[ 1 ] == '{' ) ) {
gotit = 1;
break;
}
if ( strncasecmp( left, "group", STRLENOF( "group" ) ) == 0 ) {
char *name = NULL;
char *value = NULL;
+ char *attr_name = SLAPD_GROUP_ATTR;
switch ( sty ) {
case ACL_STYLE_REGEX:
}
if ( name && *name ) {
- rc = slap_str2ad( name, &b->a_group_at, &text );
-
- if( rc != LDAP_SUCCESS ) {
- char buf[ SLAP_TEXT_BUFLEN ];
-
- snprintf( buf, sizeof( buf ),
- "group \"%s\": %s.",
- right, text );
- Debug( LDAP_DEBUG_ANY,
- "%s: line %d: %s\n",
- fname, lineno, buf );
- goto fail;
- }
+ attr_name = name;
*--name = '/';
- } else {
- rc = slap_str2ad( SLAPD_GROUP_ATTR, &b->a_group_at, &text );
+ }
- if ( rc != LDAP_SUCCESS ) {
- char buf[ SLAP_TEXT_BUFLEN ];
+ rc = slap_str2ad( attr_name, &b->a_group_at, &text );
+ if ( rc != LDAP_SUCCESS ) {
+ char buf[ SLAP_TEXT_BUFLEN ];
- snprintf( buf, sizeof( buf ),
- "group \"%s\": %s.",
- SLAPD_GROUP_ATTR, text );
- Debug( LDAP_DEBUG_ANY,
- "%s: line %d: %s\n",
- fname, lineno, buf );
- goto fail;
- }
+ snprintf( buf, sizeof( buf ),
+ "group \"%s\": %s.",
+ right, text );
+ Debug( LDAP_DEBUG_ANY,
+ "%s: line %d: %s\n",
+ fname, lineno, buf );
+ goto fail;
}
if ( !is_at_syntax( b->a_group_at->ad_type,
- SLAPD_DN_SYNTAX ) &&
- !is_at_syntax( b->a_group_at->ad_type,
- SLAPD_NAMEUID_SYNTAX ) &&
- !is_at_subtype( b->a_group_at->ad_type, slap_schema.si_ad_labeledURI->ad_type ) )
+ SLAPD_DN_SYNTAX ) /* e.g. "member" */
+ && !is_at_syntax( b->a_group_at->ad_type,
+ SLAPD_NAMEUID_SYNTAX ) /* e.g. memberUID */
+ && !is_at_subtype( b->a_group_at->ad_type,
+ slap_schema.si_ad_labeledURI->ad_type ) /* e.g. memberURL */ )
{
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
- "group \"%s\": inappropriate syntax: %s.",
+ "group \"%s\" attr \"%s\": inappropriate syntax: %s; "
+ "must be " SLAPD_DN_SYNTAX " (DN), "
+ SLAPD_NAMEUID_SYNTAX " (NameUID) "
+ "or a subtype of labeledURI.",
right,
- b->a_group_at->ad_type->sat_syntax_oid );
+ attr_name,
+ at_syntax( b->a_group_at->ad_type ) );
Debug( LDAP_DEBUG_ANY,
"%s: line %d: %s\n",
fname, lineno, buf );
{
int rc;
- struct berval vals[2];
+ ObjectClass *ocs[2];
- ber_str2bv( b->a_group_oc->soc_oid, 0, 0, &vals[0] );
- BER_BVZERO( &vals[1] );
+ ocs[0] = b->a_group_oc;
+ ocs[1] = NULL;
rc = oc_check_allowed( b->a_group_at->ad_type,
- vals, NULL );
+ ocs, NULL );
if( rc != 0 ) {
char buf[ SLAP_TEXT_BUFLEN ];
case ACL_STYLE_EXPAND:
/* cheap replacement to regex for simple expansion */
case ACL_STYLE_IP:
+ case ACL_STYLE_IPV6:
case ACL_STYLE_PATH:
/* legal, peername specific */
break;
goto fail;
}
}
+
+#ifdef LDAP_PF_INET6
+ } else if ( sty == ACL_STYLE_IPV6 ) {
+ char *addr = NULL,
+ *mask = NULL,
+ *port = NULL;
+
+ split( right, '{', &addr, &port );
+ split( addr, '%', &addr, &mask );
+
+ if ( inet_pton( AF_INET6, addr, &b->a_peername_addr6 ) != 1 ) {
+ /* illegal address */
+ Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+ "illegal peername address \"%s\".\n",
+ fname, lineno, addr );
+ goto fail;
+ }
+
+ if ( mask == NULL ) {
+ mask = "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF";
+ }
+
+ if ( inet_pton( AF_INET6, mask, &b->a_peername_mask6 ) != 1 ) {
+ /* illegal mask */
+ Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+ "illegal peername address mask "
+ "\"%s\".\n",
+ fname, lineno, mask );
+ goto fail;
+ }
+
+ b->a_peername_port = -1;
+ if ( port ) {
+ char *end = NULL;
+
+ b->a_peername_port = strtol( port, &end, 10 );
+ if ( end == port || end[0] != '}' ) {
+ /* illegal port */
+ Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+ "illegal peername port specification "
+ "\"{%s}\".\n",
+ fname, lineno, port );
+ goto fail;
+ }
+ }
+#endif /* LDAP_PF_INET6 */
}
}
continue;
{
char *access =
"<access clause> ::= access to <what> "
- "[ by <who> <access> [ <control> ] ]+ \n";
+ "[ by <who> [ <access> ] [ <control> ] ]+ \n";
char *what =
- "<what> ::= * |
[dn[.<dnstyle>]=<DN>] [filter=<filter>] [attrs=<attrspec>]\n"
+ "<what> ::= * |
dn[.<dnstyle>=<DN>] [filter=<filter>] [attrs=<attrspec>]\n"
"<attrspec> ::= <attrname> [val[/<matchingRule>][.<attrstyle>]=<value>] | <attrlist>\n"
"<attrlist> ::= <attr> [ , <attrlist> ]\n"
"<attr> ::= <attrname> | @<objectClass> | !<objectClass> | entry | children\n";
"exact | regex\n"
"<attrstyle> ::= exact | regex | base(Object) | one(level) | "
"sub(tree) | children\n"
- "<peernamestyle> ::= exact | regex | ip | path\n"
+ "<peernamestyle> ::= exact | regex | ip | ipv6 | path\n"
"<domainstyle> ::= exact | regex | base(Object) | sub(tree)\n"
"<access> ::= [[real]self]{<level>|<priv>}\n"
"<level> ::= none|disclose|auth|compare|search|read|{write|add|delete}|manage\n"
free( a );
}
-/* Because backend_startup uses acl_append to tack on the global_acl to
- * the end of each backend's acl, we cannot just take one argument and
- * merrily free our way to the end of the list. backend_destroy calls us
- * with the be_acl in arg1, and global_acl in arg2 to give us a stopping
- * point. config_destroy calls us with global_acl in arg1 and NULL in
- * arg2, so we then proceed to polish off the global_acl.
- */
void
-acl_destroy( AccessControl *a, AccessControl *end )
+acl_destroy( AccessControl *a )
{
AccessControl *n;
- for ( ; a && a != end; a = n ) {
+ for ( ; a; a = n ) {
n = a->acl_next;
acl_free( a );
}
+
+ if ( !BER_BVISNULL( &aclbuf ) ) {
+ ch_free( aclbuf.bv_val );
+ BER_BVZERO( &aclbuf );
+ }
}
char *
return( ACL_INVALID_ACCESS );
}
-#define ACLBUF_MAXLEN 8192
+static char *
+safe_strncopy( char *ptr, const char *src, size_t n, struct berval *buf )
+{
+ while ( ptr + n >= buf->bv_val + buf->bv_len ) {
+ char *tmp = ch_realloc( buf->bv_val, 2*buf->bv_len );
+ if ( tmp == NULL ) {
+ return NULL;
+ }
+ ptr = tmp + (ptr - buf->bv_val);
+ buf->bv_val = tmp;
+ buf->bv_len *= 2;
+ }
+
+ return lutil_strncopy( ptr, src, n );
+}
+
+static char *
+safe_strcopy( char *ptr, const char *s, struct berval *buf )
+{
+ size_t n = strlen( s );
+
+ return safe_strncopy( ptr, s, n, buf );
+}
+
+static char *
+safe_strbvcopy( char *ptr, const struct berval *bv, struct berval *buf )
+{
+ return safe_strncopy( ptr, bv->bv_val, bv->bv_len, buf );
+}
-static char aclbuf[ACLBUF_MAXLEN];
+#define acl_safe_strcopy( ptr, s ) safe_strcopy( (ptr), (s), &aclbuf )
+#define acl_safe_strncopy( ptr, s, n ) safe_strncopy( (ptr), (s), (n), &aclbuf )
+#define acl_safe_strbvcopy( ptr, bv ) safe_strbvcopy( (ptr), (bv), &aclbuf )
static char *
dnaccess2text( slap_dn_access *bdn, char *ptr, int is_realdn )
*ptr++ = ' ';
if ( is_realdn ) {
- ptr = lutil_strcopy( ptr, "real" );
+ ptr = acl_safe_strcopy( ptr, "real" );
}
if ( ber_bvccmp( &bdn->a_pat, '*' ) ||
assert( ! ber_bvccmp( &bdn->a_pat, '*' ) );
}
- ptr = lutil_strcopy( ptr, bdn->a_pat.bv_val );
+ ptr = acl_safe_strbvcopy( ptr, &bdn->a_pat );
if ( bdn->a_style == ACL_STYLE_SELF && bdn->a_self_level != 0 ) {
- int n = sprintf( ptr, ".level{%d}", bdn->a_self_level );
+ char buf[SLAP_TEXT_BUFLEN];
+ int n = snprintf( buf, sizeof(buf), ".level{%d}", bdn->a_self_level );
if ( n > 0 ) {
- ptr += n;
+ ptr = acl_safe_strncopy( ptr, buf, n );
} /* else ? */
}
} else {
- ptr = lutil_strcopy( ptr, "dn." );
+ ptr = acl_safe_strcopy( ptr, "dn." );
if ( bdn->a_style == ACL_STYLE_BASE )
- ptr = lutil_strcopy( ptr, style_base );
+ ptr = acl_safe_strcopy( ptr, style_base );
else
- ptr = lutil_strcopy( ptr, style_strings[bdn->a_style] );
+ ptr = acl_safe_strcopy( ptr, style_strings[bdn->a_style] );
if ( bdn->a_style == ACL_STYLE_LEVEL ) {
- int n = sprintf( ptr, "{%d}", bdn->a_level );
+ char buf[SLAP_TEXT_BUFLEN];
+ int n = snprintf( buf, sizeof(buf), "{%d}", bdn->a_level );
if ( n > 0 ) {
- ptr += n;
+ ptr = acl_safe_strncopy( ptr, buf, n );
} /* else ? */
}
if ( bdn->a_expand ) {
- ptr = lutil_strcopy( ptr, ",expand" );
+ ptr = acl_safe_strcopy( ptr, ",expand" );
}
- *ptr++ = '=';
- *ptr++ = '"';
- ptr = lutil_strcopy( ptr, bdn->a_pat.bv_val );
- *ptr++ = '"';
+ ptr = acl_safe_strcopy( ptr, "=\"" );
+ ptr = acl_safe_strbvcopy( ptr, &bdn->a_pat );
+ ptr = acl_safe_strcopy( ptr, "\"" );
}
return ptr;
}
{
char maskbuf[ACCESSMASK_MAXLEN];
- ptr = lutil_strcopy( ptr, "\tby" );
+ ptr = acl_safe_strcopy( ptr, "\tby" );
if ( !BER_BVISEMPTY( &b->a_dn_pat ) ) {
ptr = dnaccess2text( &b->a_dn, ptr, 0 );
}
if ( b->a_dn_at ) {
- ptr = lutil_strcopy( ptr, " dnattr=" );
- ptr = lutil_strcopy( ptr, b->a_dn_at->ad_cname.bv_val );
+ ptr = acl_safe_strcopy( ptr, " dnattr=" );
+ ptr = acl_safe_strbvcopy( ptr, &b->a_dn_at->ad_cname );
}
if ( !BER_BVISEMPTY( &b->a_realdn_pat ) ) {
ptr = dnaccess2text( &b->a_realdn, ptr, 1 );
}
if ( b->a_realdn_at ) {
- ptr = lutil_strcopy( ptr, " realdnattr=" );
- ptr = lutil_strcopy( ptr, b->a_realdn_at->ad_cname.bv_val );
+ ptr = acl_safe_strcopy( ptr, " realdnattr=" );
+ ptr = acl_safe_strbvcopy( ptr, &b->a_realdn_at->ad_cname );
}
if ( !BER_BVISEMPTY( &b->a_group_pat ) ) {
- ptr = lutil_strcopy( ptr, " group/" );
- ptr = lutil_strcopy( ptr, b->a_group_oc ?
+ ptr = acl_safe_strcopy( ptr, " group/" );
+ ptr = acl_safe_strcopy( ptr, b->a_group_oc ?
b->a_group_oc->soc_cname.bv_val : SLAPD_GROUP_CLASS );
- *ptr++ = '/';
- ptr = lutil_strcopy( ptr, b->a_group_at ?
+ ptr = acl_safe_strcopy( ptr, "/" );
+ ptr = acl_safe_strcopy( ptr, b->a_group_at ?
b->a_group_at->ad_cname.bv_val : SLAPD_GROUP_ATTR );
- *ptr++ = '.';
- ptr = lutil_strcopy( ptr, style_strings[b->a_group_style] );
- *ptr++ = '=';
- *ptr++ = '"';
- ptr = lutil_strcopy( ptr, b->a_group_pat.bv_val );
- *ptr++ = '"';
+ ptr = acl_safe_strcopy( ptr, "." );
+ ptr = acl_safe_strcopy( ptr, style_strings[b->a_group_style] );
+ ptr = acl_safe_strcopy( ptr, "=\"" );
+ ptr = acl_safe_strbvcopy( ptr, &b->a_group_pat );
+ ptr = acl_safe_strcopy( ptr, "\"" );
}
if ( !BER_BVISEMPTY( &b->a_peername_pat ) ) {
- ptr = lutil_strcopy( ptr, " peername" );
- *ptr++ = '.';
- ptr = lutil_strcopy( ptr, style_strings[b->a_peername_style] );
- *ptr++ = '=';
- *ptr++ = '"';
- ptr = lutil_strcopy( ptr, b->a_peername_pat.bv_val );
- *ptr++ = '"';
+ ptr = acl_safe_strcopy( ptr, " peername" );
+ ptr = acl_safe_strcopy( ptr, "." );
+ ptr = acl_safe_strcopy( ptr, style_strings[b->a_peername_style] );
+ ptr = acl_safe_strcopy( ptr, "=\"" );
+ ptr = acl_safe_strbvcopy( ptr, &b->a_peername_pat );
+ ptr = acl_safe_strcopy( ptr, "\"" );
}
if ( !BER_BVISEMPTY( &b->a_sockname_pat ) ) {
- ptr = lutil_strcopy( ptr, " sockname" );
- *ptr++ = '.';
- ptr = lutil_strcopy( ptr, style_strings[b->a_sockname_style] );
- *ptr++ = '=';
- *ptr++ = '"';
- ptr = lutil_strcopy( ptr, b->a_sockname_pat.bv_val );
- *ptr++ = '"';
+ ptr = acl_safe_strcopy( ptr, " sockname" );
+ ptr = acl_safe_strcopy( ptr, "." );
+ ptr = acl_safe_strcopy( ptr, style_strings[b->a_sockname_style] );
+ ptr = acl_safe_strcopy( ptr, "=\"" );
+ ptr = acl_safe_strbvcopy( ptr, &b->a_sockname_pat );
+ ptr = acl_safe_strcopy( ptr, "\"" );
}
if ( !BER_BVISEMPTY( &b->a_domain_pat ) ) {
- ptr = lutil_strcopy( ptr, " domain" );
- *ptr++ = '.';
- ptr = lutil_strcopy( ptr, style_strings[b->a_domain_style] );
+ ptr = acl_safe_strcopy( ptr, " domain" );
+ ptr = acl_safe_strcopy( ptr, "." );
+ ptr = acl_safe_strcopy( ptr, style_strings[b->a_domain_style] );
if ( b->a_domain_expand ) {
- ptr = lutil_strcopy( ptr, ",expand" );
+ ptr = acl_safe_strcopy( ptr, ",expand" );
}
- *ptr++ = '=';
- ptr = lutil_strcopy( ptr, b->a_domain_pat.bv_val );
+ ptr = acl_safe_strcopy( ptr, "=" );
+ ptr = acl_safe_strbvcopy( ptr, &b->a_domain_pat );
}
if ( !BER_BVISEMPTY( &b->a_sockurl_pat ) ) {
- ptr = lutil_strcopy( ptr, " sockurl" );
- *ptr++ = '.';
- ptr = lutil_strcopy( ptr, style_strings[b->a_sockurl_style] );
- *ptr++ = '=';
- *ptr++ = '"';
- ptr = lutil_strcopy( ptr, b->a_sockurl_pat.bv_val );
- *ptr++ = '"';
+ ptr = acl_safe_strcopy( ptr, " sockurl" );
+ ptr = acl_safe_strcopy( ptr, "." );
+ ptr = acl_safe_strcopy( ptr, style_strings[b->a_sockurl_style] );
+ ptr = acl_safe_strcopy( ptr, "=\"" );
+ ptr = acl_safe_strbvcopy( ptr, &b->a_sockurl_pat );
+ ptr = acl_safe_strcopy( ptr, "\"" );
}
if ( !BER_BVISEMPTY( &b->a_set_pat ) ) {
- ptr = lutil_strcopy( ptr, " set" );
- *ptr++ = '.';
- ptr = lutil_strcopy( ptr, style_strings[b->a_set_style] );
- *ptr++ = '=';
- *ptr++ = '"';
- ptr = lutil_strcopy( ptr, b->a_set_pat.bv_val );
- *ptr++ = '"';
+ ptr = acl_safe_strcopy( ptr, " set" );
+ ptr = acl_safe_strcopy( ptr, "." );
+ ptr = acl_safe_strcopy( ptr, style_strings[b->a_set_style] );
+ ptr = acl_safe_strcopy( ptr, "=\"" );
+ ptr = acl_safe_strbvcopy( ptr, &b->a_set_pat );
+ ptr = acl_safe_strcopy( ptr, "\"" );
}
#ifdef SLAP_DYNACL
struct berval bv = BER_BVNULL;
(void)( *da->da_unparse )( da->da_private, &bv );
assert( !BER_BVISNULL( &bv ) );
- ptr = lutil_strcopy( ptr, bv.bv_val );
+ ptr = acl_safe_strbvcopy( ptr, &bv );
ch_free( bv.bv_val );
}
}
/* Security Strength Factors */
if ( b->a_authz.sai_ssf ) {
- ptr += sprintf( ptr, " ssf=%u",
+ char buf[SLAP_TEXT_BUFLEN];
+ int n = snprintf( buf, sizeof(buf), " ssf=%u",
b->a_authz.sai_ssf );
+ ptr = acl_safe_strncopy( ptr, buf, n );
}
if ( b->a_authz.sai_transport_ssf ) {
- ptr += sprintf( ptr, " transport_ssf=%u",
+ char buf[SLAP_TEXT_BUFLEN];
+ int n = snprintf( buf, sizeof(buf), " transport_ssf=%u",
b->a_authz.sai_transport_ssf );
+ ptr = acl_safe_strncopy( ptr, buf, n );
}
if ( b->a_authz.sai_tls_ssf ) {
- ptr += sprintf( ptr, " tls_ssf=%u",
+ char buf[SLAP_TEXT_BUFLEN];
+ int n = snprintf( buf, sizeof(buf), " tls_ssf=%u",
b->a_authz.sai_tls_ssf );
+ ptr = acl_safe_strncopy( ptr, buf, n );
}
if ( b->a_authz.sai_sasl_ssf ) {
- ptr += sprintf( ptr, " sasl_ssf=%u",
+ char buf[SLAP_TEXT_BUFLEN];
+ int n = snprintf( buf, sizeof(buf), " sasl_ssf=%u",
b->a_authz.sai_sasl_ssf );
+ ptr = acl_safe_strncopy( ptr, buf, n );
}
- *ptr++ = ' ';
+ ptr = acl_safe_strcopy( ptr, " " );
if ( b->a_dn_self ) {
- ptr = lutil_strcopy( ptr, "self" );
+ ptr = acl_safe_strcopy( ptr, "self" );
} else if ( b->a_realdn_self ) {
- ptr = lutil_strcopy( ptr, "realself" );
+ ptr = acl_safe_strcopy( ptr, "realself" );
}
- ptr = lutil_strcopy( ptr, accessmask2str( b->a_access_mask, maskbuf, 0 ));
+ ptr = acl_safe_strcopy( ptr, accessmask2str( b->a_access_mask, maskbuf, 0 ));
if ( !maskbuf[0] ) ptr--;
if( b->a_type == ACL_BREAK ) {
- ptr = lutil_strcopy( ptr, " break" );
+ ptr = acl_safe_strcopy( ptr, " break" );
} else if( b->a_type == ACL_CONTINUE ) {
- ptr = lutil_strcopy( ptr, " continue" );
+ ptr = acl_safe_strcopy( ptr, " continue" );
} else if( b->a_type != ACL_STOP ) {
- ptr = lutil_strcopy( ptr, " unknown-control" );
+ ptr = acl_safe_strcopy( ptr, " unknown-control" );
} else {
- if ( !maskbuf[0] ) ptr = lutil_strcopy( ptr, " stop" );
+ if ( !maskbuf[0] ) ptr = acl_safe_strcopy( ptr, " stop" );
}
- *ptr++ = '\n';
+ ptr = acl_safe_strcopy( ptr, "\n" );
return ptr;
}
char *ptr;
int to = 0;
- bv->bv_val = aclbuf;
+ if ( BER_BVISNULL( &aclbuf ) ) {
+ aclbuf.bv_val = ch_malloc( ACLBUF_CHUNKSIZE );
+ aclbuf.bv_len = ACLBUF_CHUNKSIZE;
+ }
+
bv->bv_len = 0;
- ptr = bv->bv_val;
+ ptr = aclbuf.bv_val;
- ptr = lutil_strcopy( ptr, "to" );
+ ptr = acl_safe_strcopy( ptr, "to" );
if ( !BER_BVISNULL( &a->acl_dn_pat ) ) {
to++;
- ptr = lutil_strcopy( ptr, " dn." );
+ ptr = acl_safe_strcopy( ptr, " dn." );
if ( a->acl_dn_style == ACL_STYLE_BASE )
- ptr = lutil_strcopy( ptr, style_base );
+ ptr = acl_safe_strcopy( ptr, style_base );
else
- ptr = lutil_strcopy( ptr, style_strings[a->acl_dn_style] );
- *ptr++ = '=';
- *ptr++ = '"';
- ptr = lutil_strcopy( ptr, a->acl_dn_pat.bv_val );
- ptr = lutil_strcopy( ptr, "\"\n" );
+ ptr = acl_safe_strcopy( ptr, style_strings[a->acl_dn_style] );
+ ptr = acl_safe_strcopy( ptr, "=\"" );
+ ptr = acl_safe_strbvcopy( ptr, &a->acl_dn_pat );
+ ptr = acl_safe_strcopy( ptr, "\"\n" );
}
if ( a->acl_filter != NULL ) {
- struct berval bv = BER_BVNULL;
+ struct berval fbv = BER_BVNULL;
to++;
- filter2bv( a->acl_filter, &bv );
- ptr = lutil_strcopy( ptr, " filter=\"" );
- ptr = lutil_strcopy( ptr, bv.bv_val );
- *ptr++ = '"';
- *ptr++ = '\n';
- ch_free( bv.bv_val );
+ filter2bv( a->acl_filter, &fbv );
+ ptr = acl_safe_strcopy( ptr, " filter=\"" );
+ ptr = acl_safe_strbvcopy( ptr, &fbv );
+ ptr = acl_safe_strcopy( ptr, "\"\n" );
+ ch_free( fbv.bv_val );
}
if ( a->acl_attrs != NULL ) {
AttributeName *an;
to++;
- ptr = lutil_strcopy( ptr, " attrs=" );
+ ptr = acl_safe_strcopy( ptr, " attrs=" );
for ( an = a->acl_attrs; an && !BER_BVISNULL( &an->an_name ); an++ ) {
- if ( ! first ) *ptr++ = ',';
+ if ( ! first ) ptr = acl_safe_strcopy( ptr, ",");
if (an->an_oc) {
- *ptr++ = an->an_oc_exclude ? '!' : '@';
- ptr = lutil_strcopy( ptr, an->an_oc->soc_cname.bv_val );
+ ptr = acl_safe_strcopy( ptr, ( an->an_flags & SLAP_AN_OCEXCLUDE ) ? "!" : "@" );
+ ptr = acl_safe_strbvcopy( ptr, &an->an_oc->soc_cname );
} else {
- ptr = lutil_strcopy( ptr, an->an_name.bv_val );
+ ptr = acl_safe_strbvcopy( ptr, &an->an_name );
}
first = 0;
}
- *ptr++ = '\n';
+ ptr = acl_safe_strcopy( ptr, "\n" );
}
if ( !BER_BVISEMPTY( &a->acl_attrval ) ) {
to++;
- ptr = lutil_strcopy( ptr, " val." );
+ ptr = acl_safe_strcopy( ptr, " val." );
if ( a->acl_attrval_style == ACL_STYLE_BASE &&
a->acl_attrs[0].an_desc->ad_type->sat_syntax ==
slap_schema.si_syn_distinguishedName )
- ptr = lutil_strcopy( ptr, style_base );
+ ptr = acl_safe_strcopy( ptr, style_base );
else
- ptr = lutil_strcopy( ptr, style_strings[a->acl_attrval_style] );
- *ptr++ = '=';
- *ptr++ = '"';
- ptr = lutil_strcopy( ptr, a->acl_attrval.bv_val );
- *ptr++ = '"';
- *ptr++ = '\n';
+ ptr = acl_safe_strcopy( ptr, style_strings[a->acl_attrval_style] );
+ ptr = acl_safe_strcopy( ptr, "=\"" );
+ ptr = acl_safe_strbvcopy( ptr, &a->acl_attrval );
+ ptr = acl_safe_strcopy( ptr, "\"\n" );
}
- if( !to ) {
- ptr = lutil_strcopy( ptr, " *\n" );
+ if ( !to ) {
+ ptr = acl_safe_strcopy( ptr, " *\n" );
}
for ( b = a->acl_access; b != NULL; b = b->a_next ) {
ptr = access2text( b, ptr );
}
*ptr = '\0';
+ bv->bv_val = aclbuf.bv_val;
bv->bv_len = ptr - bv->bv_val;
}
projects / openldap / blobdiff