#include "slap.h"
-extern Filter *str2filter();
-extern struct acl *global_acl;
-extern char **str2charray();
-extern char *dn_upcase();
-
-static void split();
-static void acl_append();
-static void access_append();
-static void acl_usage();
+static void split(char *line, int splitchar, char **left, char **right);
+static void acl_append(struct acl **l, struct acl *a);
+static void access_append(struct access **l, struct access *a);
+static void acl_usage(void);
#ifdef LDAP_DEBUG
-static void print_acl();
-static void print_access();
+static void print_acl(struct acl *a);
+static void print_access(struct access *b);
#endif
-int
+static int
regtest(char *fname, int lineno, char *pat) {
int e;
regex_t re;
char buf[512];
- int size;
+ unsigned size;
char *sp;
char *dp;
)
{
int i;
- char *e, *left, *right;
+ char *left, *right;
struct acl *a;
struct access *b;
fname, lineno, right, buf );
acl_usage();
}
- a->acl_dnpat = strdup( ".*" );
+ a->acl_dnpat = ch_strdup( ".*" );
continue;
}
acl_usage();
} else {
- a->acl_dnpat = dn_upcase(strdup( right ));
+ a->acl_dnpat = dn_upcase(ch_strdup( right ));
}
} else if ( strncasecmp( left, "attr", 4 )
== 0 ) {
alist = str2charray( right, "," );
charray_merge( &a->acl_attrs, alist );
- free( alist );
+ charray_free( alist );
} else {
fprintf( stderr,
"%s: line %d: expecting <what> got \"%s\"\n",
* by clause consists of <who> and <access>
*/
- b = (struct access *) ch_calloc( 1,
- sizeof(struct access) );
+ b = (struct access *) ch_calloc( 1, sizeof(struct access) );
if ( ++i == argc ) {
fprintf( stderr,
/* get <who> */
split( argv[i], '=', &left, &right );
if ( strcasecmp( argv[i], "*" ) == 0 ) {
- b->a_dnpat = strdup( ".*" );
+ b->a_dnpat = ch_strdup( ".*" );
} else if ( strcasecmp( argv[i], "self" ) == 0 ) {
- b->a_dnpat = strdup( "self" );
+ b->a_dnpat = ch_strdup( "self" );
} else if ( strcasecmp( left, "dn" ) == 0 ) {
regtest(fname, lineno, right);
- b->a_dnpat = dn_upcase( strdup( right ) );
+ b->a_dnpat = dn_upcase( ch_strdup( right ) );
} else if ( strcasecmp( left, "dnattr" ) == 0 ) {
- b->a_dnattr = strdup( right );
+ b->a_dnattr = ch_strdup( right );
#ifdef SLAPD_ACLGROUPS
} else if ( strcasecmp( left, "group" ) == 0 ) {
*name++ = '\0';
}
- b->a_group = dn_upcase(strdup( right ));
+ b->a_group = dn_upcase(ch_strdup( right ));
if (value && *value) {
- b->a_objectclassvalue = strdup(value);
+ b->a_objectclassvalue = ch_strdup(value);
*--value = '/';
}
else
- b->a_objectclassvalue = strdup("groupOfNames");
+ b->a_objectclassvalue = ch_strdup("groupOfNames");
if (name && *name) {
- b->a_groupattrname = strdup(name);
+ b->a_groupattrname = ch_strdup(name);
*--name = '/';
}
else
- b->a_groupattrname = strdup("member");
+ b->a_groupattrname = ch_strdup("member");
} else if ( strcasecmp( left, "domain" ) == 0 ) {
char *s;
regtest(fname, lineno, right);
- b->a_domainpat = strdup( right );
+ b->a_domainpat = ch_strdup( right );
/* normalize the domain */
for ( s = b->a_domainpat; *s; s++ ) {
- *s = TOLOWER( *s );
+ *s = TOLOWER( (unsigned char) *s );
}
} else if ( strcasecmp( left, "addr" ) == 0 ) {
regtest(fname, lineno, right);
- b->a_addrpat = strdup( right );
+ b->a_addrpat = ch_strdup( right );
} else {
fprintf( stderr,
"%s: line %d: expecting <who> got \"%s\"\n",
} else {
- if (ldap_debug&LDAP_DEBUG_ACL)
+#ifdef LDAP_DEBUG
+ if (ldap_debug & LDAP_DEBUG_ACL)
print_acl(a);
-
+#endif
if ( a->acl_access == NULL ) {
fprintf( stderr,
}
static void
-acl_usage()
+acl_usage( void )
{
fprintf( stderr, "\n<access clause> ::= access to <what> [ by <who> <access> ]+ \n" );
fprintf( stderr, "<what> ::= * | [dn=<regex>] [filter=<ldapfilter>] [attrs=<attrlist>]\n" );
static void
print_access( struct access *b )
{
- printf( "\tby" );
+ fprintf( stderr, "\tby" );
+
if ( b->a_dnpat != NULL ) {
fprintf( stderr, " dn=%s", b->a_dnpat );
} else if ( b->a_addrpat != NULL ) {