mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-17 14:00:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update ACL field names and usage statement to match -devel post

Browse Source
This commit is contained in:
Kurt Zeilenga 1999-07-22 00:50:11 +00:00
parent a11630f9b8
commit 5600097ae1
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
servers/slapd/acl.c
View File

@ -275,12 +275,12 @@ acl_access_allowed(
}
}
if ( b->a_url_pat != NULL ) {
Debug( LDAP_DEBUG_ARGS, "<= check a_url_pat: %s\n",
b->a_url_pat, 0, 0 );
if ( b->a_sockurl_pat != NULL ) {
Debug( LDAP_DEBUG_ARGS, "<= check a_sockurl_pat: %s\n",
b->a_sockurl_pat, 0, 0 );
if ( strcmp( b->a_url_pat, ".*" ) != 0 &&
!regex_matches( b->a_url_pat, conn->c_listener_url,
if ( strcmp( b->a_sockurl_pat, ".*" ) != 0 &&
!regex_matches( b->a_sockurl_pat, conn->c_listener_url,
edn, matches ) )
{
continue;

14
servers/slapd/aclparse.c
View File

@ -304,16 +304,16 @@ parse_acl(
continue;
}
if ( strcasecmp( left, "url" ) == 0 ) {
if( b->a_url_pat != NULL ) {
if ( strcasecmp( left, "sockurl" ) == 0 ) {
if( b->a_sockurl_pat != NULL ) {
fprintf( stderr,
"%s: line %d: url pattern already specified.\n",
"%s: line %d: sockurl pattern already specified.\n",
fname, lineno );
acl_usage();
}
regtest(fname, lineno, right);
b->a_url_pat = ch_strdup( right );
b->a_sockurl_pat = ch_strdup( right );
continue;
}
@ -433,7 +433,7 @@ acl_usage( void )
"<attrlist> ::= <attr> | <attr> , <attrlist>\n"
"<attr> ::= <attrname> | entry | children\n"
"<who> ::= [ * | anonymous | self | dn=<regex> ]\n"
"\t[dnattr=<attrname>]\t"
"\t[dnattr=<attrname>]\n"
"\t[group[/<objectclass>[/<attrname>]]=<regex>]\n"
"\t[peername=<regex>] [sockname=<regex>]\n"
"\t[domain=<regex>] [sockurl=<regex>]\n"
@ -520,8 +520,8 @@ print_access( Access *b )
fprintf( stderr, " domain=%s", b->a_domain_pat );
}
if ( b->a_url_pat != NULL ) {
fprintf( stderr, " url=%s", b->a_url_pat );
if ( b->a_sockurl_pat != NULL ) {
fprintf( stderr, " sockurl=%s", b->a_sockurl_pat );
}
fprintf( stderr, "\n" );

2
servers/slapd/slap.h
View File

@ -237,7 +237,7 @@ typedef struct slap_access {
char *a_sockname_pat;
char *a_domain_pat;
char *a_url_pat;
char *a_sockurl_pat;
/* ACL Groups */
char *a_group_pat;