]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/acl.c
Add missing semicolon.
[openldap] / servers / slapd / acl.c
index cd3dad0018bc84f78df65780842e6240fb71b932..15bbcd4fba8b16150251b30e1e3a8a0cafad2c65 100644 (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;
@@ -360,7 +360,10 @@ acl_access_allowed(
                         */
                        /* see if asker is listed in dnattr */
                        string_expand(buf, sizeof(buf), b->a_group_pat, edn, matches);
-                       (void) dn_normalize_case(buf);
+                       if ( dn_normalize_case(buf) == NULL ) {
+                               /* did not expand to a valid dn */
+                               continue;
+                       }
 
                        if (backend_group(be, e, buf, op->o_ndn,
                                b->a_group_oc, b->a_group_at) != 0)