Very crude LDIF changes:

[openldap] / servers / slapd / aclparse.c

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 0aaf463d1f0a34de96574a955e55270ffe9e45a7..6a291fd2b127bf6cd308c3bb6e8c8704e5627ba6 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -184,7 +184,7 @@ parse_acl(
 
                        /* get <who> */
                        for ( ; i < argc; i++ ) {
-                               char* pat;
+                               char *pat;
                                split( argv[i], '=', &left, &right );
 
                                if ( strcasecmp( argv[i], "*" ) == 0 ) {
@@ -196,6 +196,8 @@ parse_acl(
                                } else if ( strcasecmp( left, "dn" ) == 0 ) {
                                        regtest(fname, lineno, right);
                                        pat = ch_strdup( right );
+                               } else {
+                                       pat = NULL;
                                }
 
                                if( pat != NULL ) {
@@ -302,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;
                                }
 
@@ -430,10 +432,11 @@ acl_usage( void )
                "<what> ::= * | [dn=<regex>] [filter=<ldapfilter>] [attrs=<attrlist>]\n"
                "<attrlist> ::= <attr> | <attr> , <attrlist>\n"
                "<attr> ::= <attrname> | entry | children\n"
-               "<who> ::= * | anonymous | self | dn=<regex>\n"
-                       "\t| dnattr=<attrname> | group[/<objectclass>[/<attrname>]]=<regex>\n"
-                       "\t| peername=<regex> | sockname=<regex>\n"
-                       "\t| domain=<regex> | sockurl=<regex>\n"
+               "<who> ::= [ * | anonymous | self | dn=<regex> ]\n"
+                       "\t[dnattr=<attrname>]\n"
+                       "\t[group[/<objectclass>[/<attrname>]]=<regex>]\n"
+                       "\t[peername=<regex>] [sockname=<regex>]\n"
+                       "\t[domain=<regex>] [sockurl=<regex>]\n"
                "<access> ::= [self]{none|auth|compare|search|read|write}\n"
                );
        exit( 1 );
@@ -517,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" );