#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], "anonymous" ) == 0 ) {
+ b->a_dnpat = ch_strdup( "anonymous" );
} 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 );
-
-#ifdef SLAPD_ACLGROUPS
- } else if ( strcasecmp( left, "group" ) == 0 ) {
- char *name = NULL;
- char *value = NULL;
- regtest(fname, lineno, right);
+ b->a_dnattr = ch_strdup( right );
- /* format of string is "group/objectClassValue/groupAttrName"
- */
- if ((value = strchr(right, '/')) != NULL) {
- *value++ = '\0';
- if (value && *value && (name = strchr(value, '/')) != NULL)
- *name++ = '\0';
- }
+ } else if ( strncasecmp( left, "group", sizeof("group")-1 ) == 0 ) {
+ char *name = NULL;
+ char *value = NULL;
- b->a_group = dn_upcase(strdup( right ));
+ /* format of string is "group/objectClassValue/groupAttrName" */
+ if ((value = strchr(left, '/')) != NULL) {
+ *value++ = '\0';
+ if (value && *value
+ && (name = strchr(value, '/')) != NULL)
+ {
+ *name++ = '\0';
+ }
+ }
- if (value && *value) {
- b->a_objectclassvalue = strdup(value);
- *--value = '/';
- }
- else
- b->a_objectclassvalue = strdup("groupOfNames");
+ regtest(fname, lineno, right);
+ b->a_group = dn_upcase(ch_strdup( right ));
- if (name && *name) {
- b->a_groupattrname = strdup(name);
- *--name = '/';
- }
- else
- b->a_groupattrname = strdup("member");
+ if (value && *value) {
+ b->a_group_oc = ch_strdup(value);
+ *--value = '/';
+ } else {
+ b->a_group_oc = ch_strdup("groupOfNames");
+ if (name && *name) {
+ b->a_group_at = ch_strdup(name);
+ *--name = '/';
+ } else {
+ b->a_group_at = ch_strdup("member");
+ }
+ }
-#endif /* SLAPD_ACLGROUPS */
} 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",
/* get <access> */
split( argv[i], '=', &left, &right );
- if ( (b->a_access = str2access( left )) == -1 ) {
+ if ( ACL_IS_INVALID(ACL_SET(b->a_access,str2access( left ))) ) {
fprintf( stderr,
"%s: line %d: expecting <access> got \"%s\"\n",
fname, lineno, left );
{
static char buf[12];
- if ( access & ACL_SELF ) {
+ if ( ACL_IS_SELF( access ) ) {
strcpy( buf, "self" );
} else {
buf[0] = '\0';
}
- if ( access & ACL_NONE ) {
+ if ( ACL_IS_NONE(access) ) {
strcat( buf, "none" );
- } else if ( access & ACL_COMPARE ) {
+ } else if ( ACL_IS_AUTH(access) ) {
+ strcat( buf, "auth" );
+ } else if ( ACL_IS_COMPARE(access) ) {
strcat( buf, "compare" );
- } else if ( access & ACL_SEARCH ) {
+ } else if ( ACL_IS_SEARCH(access) ) {
strcat( buf, "search" );
- } else if ( access & ACL_READ ) {
+ } else if ( ACL_IS_READ(access) ) {
strcat( buf, "read" );
- } else if ( access & ACL_WRITE ) {
+ } else if ( ACL_IS_WRITE(access) ) {
strcat( buf, "write" );
+
} else {
strcat( buf, "unknown" );
}
{
int access;
- access = 0;
+ ACL_CLR(access);
+
if ( strncasecmp( str, "self", 4 ) == 0 ) {
- access |= ACL_SELF;
+ ACL_SET_SELF(access);
str += 4;
}
if ( strcasecmp( str, "none" ) == 0 ) {
- access |= ACL_NONE;
+ ACL_SET_NONE(access);
+ } else if ( strcasecmp( str, "auth" ) == 0 ) {
+ ACL_SET_AUTH(access);
} else if ( strcasecmp( str, "compare" ) == 0 ) {
- access |= ACL_COMPARE;
+ ACL_SET_COMPARE(access);
} else if ( strcasecmp( str, "search" ) == 0 ) {
- access |= ACL_SEARCH;
+ ACL_SET_SEARCH(access);
} else if ( strcasecmp( str, "read" ) == 0 ) {
- access |= ACL_READ;
+ ACL_SET_READ(access);
} else if ( strcasecmp( str, "write" ) == 0 ) {
- access |= ACL_WRITE;
+ ACL_SET_WRITE(access);
} else {
- access = -1;
+ ACL_SET_INVALID(access);
}
return( access );
}
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" );
- fprintf( stderr, "<attrlist> ::= <attr> | <attr> , <attrlist>\n" );
- fprintf( stderr, "<attr> ::= <attrname> | entry | children\n" );
- fprintf( stderr, "<who> ::= * | self | dn=<regex> | addr=<regex> |\n\tdomain=<regex> | dnattr=<dnattrname>\n" );
- fprintf( stderr, "<access> ::= [self]{none | compare | search | read | write }\n" );
+ fprintf( stderr, "\n"
+ "<access clause> ::= access to <what> [ by <who> <access> ]+ \n"
+ "<what> ::= * | [dn=<regex>] [filter=<ldapfilter>] [attrs=<attrlist>]\n"
+ "<attrlist> ::= <attr> | <attr> , <attrlist>\n"
+ "<attr> ::= <attrname> | entry | children\n"
+ "<who> ::= * | anonymous | self | dn=<regex> | addr=<regex>\n"
+ "\t| domain=<regex> | dnattr=<dnattrname>\n"
+ "\t| group[/<objectclass>[/<attrname>]]=<regex>\n"
+ "<access> ::= [self]{none|auth|compare|search|read|write}\n"
+ );
exit( 1 );
}
static void
print_access( struct access *b )
{
- printf( "\tby" );
+ fprintf( stderr, "\tby" );
+
if ( b->a_dnpat != NULL ) {
- fprintf( stderr, " dn=%s", b->a_dnpat );
+ if( strcmp(b->a_dnpat, "anonymous") == 0 ) {
+ fprintf( stderr, " anonymous" );
+ } else if( strcmp(b->a_dnpat, "self") == 0 ) {
+ fprintf( stderr, " self" );
+ } else {
+ fprintf( stderr, " dn=%s", b->a_dnpat );
+ }
} else if ( b->a_addrpat != NULL ) {
fprintf( stderr, " addr=%s", b->a_addrpat );
} else if ( b->a_domainpat != NULL ) {
fprintf( stderr, " domain=%s", b->a_domainpat );
} else if ( b->a_dnattr != NULL ) {
fprintf( stderr, " dnattr=%s", b->a_dnattr );
- }
-#ifdef SLAPD_ACLGROUPS
- else if ( b->a_group != NULL ) {
- fprintf( stderr, " group: %s", b->a_group );
- if ( b->a_objectclassvalue )
- fprintf( stderr, " objectClassValue: %s", b->a_objectclassvalue );
- if ( b->a_groupattrname )
- fprintf( stderr, " groupAttrName: %s", b->a_groupattrname );
- }
-#endif
+ } else if ( b->a_group != NULL ) {
+ fprintf( stderr, " group: %s", b->a_group );
+ if ( b->a_group_oc ) {
+ fprintf( stderr, " objectClass: %s", b->a_group_oc );
+ if ( b->a_group_at ) {
+ fprintf( stderr, " attributeType: %s", b->a_group_at );
+ }
+ }
+ }
fprintf( stderr, "\n" );
}
projects / openldap / blobdiff