From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 22 Jul 1999 00:50:11 +0000 (+0000)
Subject: Update ACL field names and usage statement to match -devel post
X-Git-Tag: OPENLDAP_REL_ENG_2_BP~66
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5600097ae108cfbf72baba962ca2e0fb6dd228f6;p=openldap

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

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index cd3dad0018..e632c1a9f6 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -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;
diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 83a3bee8c6..6a291fd2b1 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -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" );
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 1eee373e03..aa558c6373 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -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;