]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/aclparse.c
Missed a test in AttributeDescription commit
[openldap] / servers / slapd / aclparse.c
index bb8377b95023514d1cb08e269829b8b69dc35377..c18f36e27f3559bde7306282e50c8025d53b6587 100644 (file)
@@ -92,13 +92,11 @@ parse_acl(
 )
 {
        int             i;
-       char            *left, *right;
+       char            *left, *right, *style;
        AccessControl   *a;
        Access  *b;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
        int rc;
        const char *text;
-#endif
 
        a = NULL;
        for ( i = 1; i < argc; i++ ) {
@@ -136,6 +134,14 @@ parse_acl(
                                }
 
                                split( argv[i], '=', &left, &right );
+                               split( left, '.', &left, &style );
+
+                               if ( right == NULL ) {
+                                       fprintf( stderr,
+       "%s: line %d: missing \"=\" in \"%s\" in to clause\n",
+                                           fname, lineno, left );
+                                       acl_usage();
+                               }
 
                                if ( strcasecmp( left, "dn" ) == 0 ) {
                                        if( a->acl_dn_pat != NULL ) {
@@ -146,40 +152,49 @@ parse_acl(
                                                acl_usage();
                                        }
 
-                                       if ( right == NULL ) {
-                                               fprintf( stderr,
-       "%s: line %d: missing \"=\" in \"%s\" in to clause\n",
-                                                   fname, lineno, left );
-                                               acl_usage();
-                                       }
+                                       if ( style == NULL || *style == '\0'
+                                               || strcasecmp( style, "regex" ) == 0 )
+                                       {
+                                               a->acl_dn_style = ACL_STYLE_REGEX;
+                                               if ( strcmp(right, "*") == 0 
+                                                       || strcmp(right, ".*") == 0 
+                                                       || strcmp(right, ".*$") == 0 
+                                                       || strcmp(right, "^.*") == 0 
+                                                       || strcmp(right, "^.*$$") == 0
+                                                       || strcmp(right, ".*$$") == 0 
+                                                       || strcmp(right, "^.*$$") == 0 )
+                                               {
+                                                       a->acl_dn_pat = ch_strdup( "*" );
 
-                                       if( *right == '\0' ) {
-                                               a->acl_dn_pat = ch_strdup("anonymous");
+                                               } else {
+                                                       a->acl_dn_pat = ch_strdup( right );
+                                               }
+                                       } else if ( strcasecmp( style, "base" ) == 0 ) {
+                                               a->acl_dn_style = ACL_STYLE_BASE;
+                                               a->acl_dn_pat = ch_strdup( right );
 
-                                       } else if ( strcmp(right, "*") == 0 
-                                               || strcmp(right, ".*") == 0 
-                                               || strcmp(right, ".*$") == 0 
-                                               || strcmp(right, "^.*") == 0 
-                                               || strcmp(right, "^.*$$") == 0
-                                               || strcmp(right, ".*$$") == 0 
-                                               || strcmp(right, "^.*$$") == 0 )
-                                       {
-                                               a->acl_dn_pat = ch_strdup( "*" );
+                                       } else if ( strcasecmp( style, "one" ) == 0 ) {
+                                               a->acl_dn_style = ACL_STYLE_ONE;
+                                               a->acl_dn_pat = ch_strdup( right );
 
-                                       } else {
+                                       } else if ( strcasecmp( style, "subtree" ) == 0 ) {
+                                               a->acl_dn_style = ACL_STYLE_SUBTREE;
                                                a->acl_dn_pat = ch_strdup( right );
+
+                                       } else if ( strcasecmp( style, "children" ) == 0 ) {
+                                               a->acl_dn_style = ACL_STYLE_CHILDREN;
+                                               a->acl_dn_pat = ch_strdup( right );
+
+                                       } else {
+                                               fprintf( stderr,
+       "%s: line %d: unknown dn style \"%s\" in to clause\n",
+                                                   fname, lineno, style );
+                                               acl_usage();
                                        }
 
                                        continue;
                                }
 
-                               if ( right == NULL || *right == '\0' ) {
-                                       fprintf( stderr,
-       "%s: line %d: missing \"=\" in (or value after) \"%s\" in to clause\n",
-                                           fname, lineno, left );
-                                       acl_usage();
-                               }
-
                                if ( strcasecmp( left, "filter" ) == 0 ) {
                                        if ( (a->acl_filter = str2filter(
                                            right )) == NULL ) {
@@ -210,15 +225,21 @@ parse_acl(
                        }
                        
                        if( a->acl_dn_pat != NULL ) {
-                               int e = regcomp( &a->acl_dn_re, a->acl_dn_pat,
-                                                REG_EXTENDED | REG_ICASE );
-                               if ( e ) {
-                                       char buf[512];
-                                       regerror( e, &a->acl_dn_re, buf, sizeof(buf) );
-                                       fprintf( stderr,
-                               "%s: line %d: regular expression \"%s\" bad because of %s\n",
-                                                fname, lineno, right, buf );
-                                       acl_usage();
+                               if ( a->acl_dn_style != ACL_STYLE_REGEX )
+                               {
+                                       dn_normalize(a->acl_dn_pat);
+
+                               } else {
+                                       int e = regcomp( &a->acl_dn_re, a->acl_dn_pat,
+                                                        REG_EXTENDED | REG_ICASE );
+                                       if ( e ) {
+                                               char buf[512];
+                                               regerror( e, &a->acl_dn_re, buf, sizeof(buf) );
+                                               fprintf( stderr,
+                                       "%s: line %d: regular expression \"%s\" bad because of %s\n",
+                                                        fname, lineno, right, buf );
+                                               acl_usage();
+                                       }
                                }
                        }
 
@@ -237,7 +258,7 @@ parse_acl(
 
                        b = (Access *) ch_calloc( 1, sizeof(Access) );
 
-                       ACL_INVALIDATE( b->a_mask );
+                       ACL_INVALIDATE( b->a_access_mask );
 
                        if ( ++i == argc ) {
                                fprintf( stderr,
@@ -249,7 +270,30 @@ parse_acl(
                        /* get <who> */
                        for ( ; i < argc; i++ ) {
                                char *pat;
+                               slap_style_t sty = ACL_STYLE_REGEX;
+
                                split( argv[i], '=', &left, &right );
+                               split( left, '.', &left, &style );
+                               if ( style == NULL || *style == '\0'
+                                       || strcasecmp( style, "regex" ) == 0 )
+                               {
+                                       sty = ACL_STYLE_REGEX;
+                               } else if ( strcasecmp( style, "exact" ) == 0 ) {
+                                       sty = ACL_STYLE_EXACT;
+                               } else if ( strcasecmp( style, "base" ) == 0 ) {
+                                       sty = ACL_STYLE_BASE;
+                               } else if ( strcasecmp( style, "one" ) == 0 ) {
+                                       sty = ACL_STYLE_ONE;
+                               } else if ( strcasecmp( style, "subtree" ) == 0 ) {
+                                       sty = ACL_STYLE_SUBTREE;
+                               } else if ( strcasecmp( style, "children" ) == 0 ) {
+                                       sty = ACL_STYLE_CHILDREN;
+                               } else {
+                                       fprintf( stderr,
+                                               "%s: line %d: unknown style \"%s\" in by clause\n",
+                                           fname, lineno, style );
+                                       acl_usage();
+                               }
 
                                if ( strcasecmp( argv[i], "*" ) == 0 ) {
                                        pat = ch_strdup( "*" );
@@ -264,39 +308,50 @@ parse_acl(
                                        pat = ch_strdup( "users" );
 
                                } else if ( strcasecmp( left, "dn" ) == 0 ) {
-                                       if( right == NULL ) {
-                                               /* no '=' */
-                                               pat = ch_strdup( "users" );
-
-                                       } else if (*right == '\0' ) {
-                                               /* dn="" */
-                                               pat = ch_strdup( "anonymous" );
-
-                                       } else if ( strcmp( right, "*" ) == 0 ) {
-                                               /* dn=* */
-                                               /* any or users?  users for now */
-                                               pat = ch_strdup( "users" );
-
-                                       } else if ( strcmp( right, ".+" ) == 0
-                                               || strcmp( right, "^.+" ) == 0
-                                               || strcmp( right, ".+$" ) == 0
-                                               || strcmp( right, "^.+$" ) == 0
-                                               || strcmp( right, ".+$$" ) == 0
-                                               || strcmp( right, "^.+$$" ) == 0 )
-                                       {
-                                               pat = ch_strdup( "users" );
-
-                                       } else if ( strcmp( right, ".*" ) == 0
-                                               || strcmp( right, "^.*" ) == 0
-                                               || strcmp( right, ".*$" ) == 0
-                                               || strcmp( right, "^.*$" ) == 0
-                                               || strcmp( right, ".*$$" ) == 0
-                                               || strcmp( right, "^.*$$" ) == 0 )
-                                       {
-                                               pat = ch_strdup( "*" );
+                                       if ( sty == ACL_STYLE_REGEX ) {
+                                               b->a_dn_style = ACL_STYLE_REGEX;
+                                               if( right == NULL ) {
+                                                       /* no '=' */
+                                                       pat = ch_strdup( "users" );
+
+                                               } else if (*right == '\0' ) {
+                                                       /* dn="" */
+                                                       pat = ch_strdup( "anonymous" );
+
+                                               } else if ( strcmp( right, "*" ) == 0 ) {
+                                                       /* dn=* */
+                                                       /* any or users?  users for now */
+                                                       pat = ch_strdup( "users" );
+
+                                               } else if ( strcmp( right, ".+" ) == 0
+                                                       || strcmp( right, "^.+" ) == 0
+                                                       || strcmp( right, ".+$" ) == 0
+                                                       || strcmp( right, "^.+$" ) == 0
+                                                       || strcmp( right, ".+$$" ) == 0
+                                                       || strcmp( right, "^.+$$" ) == 0 )
+                                               {
+                                                       pat = ch_strdup( "users" );
+
+                                               } else if ( strcmp( right, ".*" ) == 0
+                                                       || strcmp( right, "^.*" ) == 0
+                                                       || strcmp( right, ".*$" ) == 0
+                                                       || strcmp( right, "^.*$" ) == 0
+                                                       || strcmp( right, ".*$$" ) == 0
+                                                       || strcmp( right, "^.*$$" ) == 0 )
+                                               {
+                                                       pat = ch_strdup( "*" );
+
+                                               } else {
+                                                       regtest(fname, lineno, right);
+                                                       pat = ch_strdup( right );
+                                               }
+                                       } else if ( right == NULL || *right == '\0' ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: missing \"=\" in (or value after) \"%s\" in by clause\n",
+                                                   fname, lineno, left );
+                                               acl_usage();
 
                                        } else {
-                                               regtest(fname, lineno, right);
                                                pat = ch_strdup( right );
                                        }
 
@@ -313,6 +368,9 @@ parse_acl(
                                        }
 
                                        b->a_dn_pat = pat;
+                                       b->a_dn_style = sty;
+                                       if ( sty != ACL_STYLE_REGEX )
+                                               dn_normalize(pat);
                                        continue;
                                }
 
@@ -324,7 +382,6 @@ parse_acl(
                                                acl_usage();
                                        }
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
                                        rc = slap_str2ad( right, &b->a_dn_at, &text );
 
                                        if( rc != LDAP_SUCCESS ) {
@@ -336,7 +393,9 @@ parse_acl(
 
 
                                        if( !is_at_syntax( b->a_dn_at->ad_type,
-                                               SLAPD_DN_SYNTAX ) )
+                                               SLAPD_DN_SYNTAX ) &&
+                                               !is_at_syntax( b->a_dn_at->ad_type,
+                                               SLAPD_NAMEUID_SYNTAX ))
                                        {
                                                fprintf( stderr,
                                                        "%s: line %d: dnattr \"%s\": "
@@ -346,12 +405,16 @@ parse_acl(
                                                acl_usage();
                                        }
 
-#else
-                                       b->a_dn_at = ch_strdup( right );
-#endif
                                        continue;
                                }
 
+                               if (sty != ACL_STYLE_REGEX && sty != ACL_STYLE_BASE) {
+                                       fprintf( stderr,
+                                               "%s: line %d: inappropriate style \"%s\" in by clause\n",
+                                           fname, lineno, style );
+                                       acl_usage();
+                               }
+
                                if ( strncasecmp( left, "group", sizeof("group")-1 ) == 0 ) {
                                        char *name = NULL;
                                        char *value = NULL;
@@ -373,15 +436,17 @@ parse_acl(
                                                }
                                        }
 
-                                       regtest(fname, lineno, right);
-                                       b->a_group_pat = ch_strdup( right );
+                                       b->a_group_style = sty;
+                                       if (sty == ACL_STYLE_REGEX) {
+                                               regtest(fname, lineno, right);
+                                               b->a_group_pat = ch_strdup( right );
+                                       } else {
+                                               b->a_group_pat = ch_strdup( right );
+                                               dn_normalize(b->a_group_pat);
+                                       }
 
                                        if (value && *value) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
                                                b->a_group_oc = oc_find( value );
-#else
-                                               b->a_group_oc = ch_strdup(value);
-#endif
                                                *--value = '/';
 
                                                if( b->a_group_oc == NULL ) {
@@ -392,7 +457,6 @@ parse_acl(
                                                        acl_usage();
                                                }
                                        } else {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
                                                b->a_group_oc = oc_find(SLAPD_GROUP_CLASS);
 
                                                if( b->a_group_oc == NULL ) {
@@ -402,13 +466,8 @@ parse_acl(
                                                                fname, lineno, SLAPD_GROUP_CLASS );
                                                        acl_usage();
                                                }
-#else
-                                               b->a_group_oc = ch_strdup(SLAPD_GROUP_CLASS);
-#endif
                                        }
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-#if 0
                                        if( is_object_subclass( b->a_group_oc,
                                                slap_schema.si_oc_referral ) )
                                        {
@@ -428,12 +487,9 @@ parse_acl(
                                                        fname, lineno, value );
                                                acl_usage();
                                        }
-#endif
-#endif
 
                                        if (name && *name) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-                                               rc = slap_str2ad( right, &b->a_group_at, &text );
+                                               rc = slap_str2ad( name, &b->a_group_at, &text );
 
                                                if( rc != LDAP_SUCCESS ) {
                                                        fprintf( stderr,
@@ -441,12 +497,8 @@ parse_acl(
                                                                fname, lineno, right, text );
                                                        acl_usage();
                                                }
-#else
-                                               b->a_group_at = ch_strdup(name);
-#endif
                                                *--name = '/';
                                        } else {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
                                                rc = slap_str2ad( SLAPD_GROUP_ATTR, &b->a_group_at, &text );
 
                                                if( rc != LDAP_SUCCESS ) {
@@ -455,14 +507,12 @@ parse_acl(
                                                                fname, lineno, SLAPD_GROUP_ATTR, text );
                                                        acl_usage();
                                                }
-#else
-                                               b->a_group_at = ch_strdup( SLAPD_GROUP_ATTR );
-#endif
                                        }
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
                                        if( !is_at_syntax( b->a_group_at->ad_type,
-                                               SLAPD_DN_SYNTAX ) )
+                                               SLAPD_DN_SYNTAX ) &&
+                                           !is_at_syntax( b->a_group_at->ad_type,
+                                               SLAPD_NAMEUID_SYNTAX ) )
                                        {
                                                fprintf( stderr,
                                                        "%s: line %d: group \"%s\": inappropriate syntax: %s\n",
@@ -489,12 +539,11 @@ parse_acl(
                                                        fprintf( stderr,
                                                                "%s: line %d: group: \"%s\" not allowed by \"%s\"\n",
                                                                fname, lineno,
-                                                               b->a_group_at->ad_type,
+                                                               b->a_group_at->ad_cname.bv_val,
                                                                b->a_group_oc->soc_oid );
                                                        acl_usage();
                                                }
                                        }
-#endif
                                        continue;
                                }
 
@@ -506,7 +555,10 @@ parse_acl(
                                                acl_usage();
                                        }
 
-                                       regtest(fname, lineno, right);
+                                       b->a_peername_style = sty;
+                                       if (sty == ACL_STYLE_REGEX) {
+                                               regtest(fname, lineno, right);
+                                       }
                                        b->a_peername_pat = ch_strdup( right );
                                        continue;
                                }
@@ -519,7 +571,10 @@ parse_acl(
                                                acl_usage();
                                        }
 
-                                       regtest(fname, lineno, right);
+                                       b->a_sockname_style = sty;
+                                       if (sty == ACL_STYLE_REGEX) {
+                                               regtest(fname, lineno, right);
+                                       }
                                        b->a_sockname_pat = ch_strdup( right );
                                        continue;
                                }
@@ -532,7 +587,10 @@ parse_acl(
                                                acl_usage();
                                        }
 
-                                       regtest(fname, lineno, right);
+                                       b->a_domain_style = sty;
+                                       if (sty == ACL_STYLE_REGEX) {
+                                               regtest(fname, lineno, right);
+                                       }
                                        b->a_domain_pat = ch_strdup( right );
                                        continue;
                                }
@@ -545,11 +603,35 @@ parse_acl(
                                                acl_usage();
                                        }
 
-                                       regtest(fname, lineno, right);
+                                       b->a_sockurl_style = sty;
+                                       if (sty == ACL_STYLE_REGEX) {
+                                               regtest(fname, lineno, right);
+                                       }
                                        b->a_sockurl_pat = ch_strdup( right );
                                        continue;
                                }
 
+                               if ( strcasecmp( left, "set" ) == 0 ) {
+                                       if( b->a_set_pat != NULL ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: set attribute already specified.\n",
+                                                       fname, lineno );
+                                               acl_usage();
+                                       }
+
+                                       if ( right == NULL || *right == '\0' ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: no set is defined\n",
+                                                       fname, lineno );
+                                               acl_usage();
+                                       }
+
+                                       b->a_set_style = sty;
+                                       b->a_set_pat = ch_strdup(right);
+
+                                       continue;
+                               }
+
 #ifdef SLAPD_ACI_ENABLED
                                if ( strcasecmp( left, "aci" ) == 0 ) {
                                        if( b->a_aci_at != NULL ) {
@@ -559,7 +641,6 @@ parse_acl(
                                                acl_usage();
                                        }
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
                                        if ( right != NULL && *right != '\0' ) {
                                                rc = slap_str2ad( right, &b->a_aci_at, &text );
 
@@ -591,17 +672,114 @@ parse_acl(
                                                acl_usage();
                                        }
 
-#else
-                                       if ( right != NULL && *right != '\0' ) {
-                                               b->a_aci_at = ch_strdup( right );
-                                       } else {
-                                               b->a_aci_at = ch_strdup( SLAPD_ACI_ATTR );
-                                       }
-#endif
                                        continue;
                                }
 #endif /* SLAPD_ACI_ENABLED */
 
+                               if ( strcasecmp( left, "ssf" ) == 0 ) {
+                                       if( b->a_authz.sai_ssf ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: ssf attribute already specified.\n",
+                                                       fname, lineno );
+                                               acl_usage();
+                                       }
+
+                                       if ( right == NULL || *right == '\0' ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: no ssf is defined\n",
+                                                       fname, lineno );
+                                               acl_usage();
+                                       }
+
+                                       b->a_authz.sai_ssf = atoi( right );
+
+                                       if( !b->a_authz.sai_ssf ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: invalid ssf value (%s)\n",
+                                                       fname, lineno, right );
+                                               acl_usage();
+                                       }
+                                       continue;
+                               }
+
+                               if ( strcasecmp( left, "transport_ssf" ) == 0 ) {
+                                       if( b->a_authz.sai_transport_ssf ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: transport_ssf attribute already specified.\n",
+                                                       fname, lineno );
+                                               acl_usage();
+                                       }
+
+                                       if ( right == NULL || *right == '\0' ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: no transport_ssf is defined\n",
+                                                       fname, lineno );
+                                               acl_usage();
+                                       }
+
+                                       b->a_authz.sai_transport_ssf = atoi( right );
+
+                                       if( !b->a_authz.sai_transport_ssf ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: invalid transport_ssf value (%s)\n",
+                                                       fname, lineno, right );
+                                               acl_usage();
+                                       }
+                                       continue;
+                               }
+
+                               if ( strcasecmp( left, "tls_ssf" ) == 0 ) {
+                                       if( b->a_authz.sai_tls_ssf ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: tls_ssf attribute already specified.\n",
+                                                       fname, lineno );
+                                               acl_usage();
+                                       }
+
+                                       if ( right == NULL || *right == '\0' ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: no tls_ssf is defined\n",
+                                                       fname, lineno );
+                                               acl_usage();
+                                       }
+
+                                       b->a_authz.sai_tls_ssf = atoi( right );
+
+                                       if( !b->a_authz.sai_tls_ssf ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: invalid tls_ssf value (%s)\n",
+                                                       fname, lineno, right );
+                                               acl_usage();
+                                       }
+                                       continue;
+                               }
+
+                               if ( strcasecmp( left, "sasl_ssf" ) == 0 ) {
+                                       if( b->a_authz.sai_sasl_ssf ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: sasl_ssf attribute already specified.\n",
+                                                       fname, lineno );
+                                               acl_usage();
+                                       }
+
+                                       if ( right == NULL || *right == '\0' ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: no sasl_ssf is defined\n",
+                                                       fname, lineno );
+                                               acl_usage();
+                                       }
+
+                                       b->a_authz.sai_sasl_ssf = atoi( right );
+
+                                       if( !b->a_authz.sai_sasl_ssf ) {
+                                               fprintf( stderr,
+                                                       "%s: line %d: invalid sasl_ssf value (%s)\n",
+                                                       fname, lineno, right );
+                                               acl_usage();
+                                       }
+                                       continue;
+                               }
+
                                if( right != NULL ) {
                                        /* unsplit */
                                        right[-1] = '=';
@@ -612,7 +790,7 @@ parse_acl(
                        if( i == argc || ( strcasecmp( left, "stop" ) == 0 )) { 
                                /* out of arguments or plain stop */
 
-                               ACL_PRIV_ASSIGN(b->a_mask, ACL_PRIV_ADDITIVE);
+                               ACL_PRIV_ASSIGN(b->a_access_mask, ACL_PRIV_ADDITIVE);
                                b->a_type = ACL_STOP;
 
                                access_append( &a->acl_access, b );
@@ -622,7 +800,7 @@ parse_acl(
                        if( strcasecmp( left, "continue" ) == 0 ) {
                                /* plain continue */
 
-                               ACL_PRIV_ASSIGN(b->a_mask, ACL_PRIV_ADDITIVE);
+                               ACL_PRIV_ASSIGN(b->a_access_mask, ACL_PRIV_ADDITIVE);
                                b->a_type = ACL_CONTINUE;
 
                                access_append( &a->acl_access, b );
@@ -632,7 +810,7 @@ parse_acl(
                        if( strcasecmp( left, "break" ) == 0 ) {
                                /* plain continue */
 
-                               ACL_PRIV_ASSIGN(b->a_mask, ACL_PRIV_ADDITIVE);
+                               ACL_PRIV_ASSIGN(b->a_access_mask, ACL_PRIV_ADDITIVE);
                                b->a_type = ACL_BREAK;
 
                                access_append( &a->acl_access, b );
@@ -642,7 +820,7 @@ parse_acl(
                        if ( strcasecmp( left, "by" ) == 0 ) {
                                /* we've gone too far */
                                --i;
-                               ACL_PRIV_ASSIGN(b->a_mask, ACL_PRIV_ADDITIVE);
+                               ACL_PRIV_ASSIGN(b->a_access_mask, ACL_PRIV_ADDITIVE);
                                b->a_type = ACL_STOP;
 
                                access_append( &a->acl_access, b );
@@ -652,13 +830,13 @@ parse_acl(
                        /* get <access> */
                        if( strncasecmp( left, "self", 4 ) == 0 ) {
                                b->a_dn_self = 1;
-                               ACL_PRIV_ASSIGN( b->a_mask, str2accessmask( &left[4] ) );
+                               ACL_PRIV_ASSIGN( b->a_access_mask, str2accessmask( &left[4] ) );
 
                        } else {
-                               ACL_PRIV_ASSIGN( b->a_mask, str2accessmask( left ) );
+                               ACL_PRIV_ASSIGN( b->a_access_mask, str2accessmask( left ) );
                        }
 
-                       if( ACL_IS_INVALID( b->a_mask ) ) {
+                       if( ACL_IS_INVALID( b->a_access_mask ) ) {
                                fprintf( stderr,
                                        "%s: line %d: expecting <access> got \"%s\"\n",
                                        fname, lineno, left );
@@ -723,7 +901,7 @@ parse_acl(
 }
 
 char *
-accessmask2str( slap_access_mask_t mask, char *buf )
+accessmask2str( slap_mask_t mask, char *buf )
 {
        int none=1;
 
@@ -810,12 +988,12 @@ accessmask2str( slap_access_mask_t mask, char *buf )
        return buf;
 }
 
-slap_access_mask_t
+slap_mask_t
 str2accessmask( const char *str )
 {
-       slap_access_mask_t      mask;
+       slap_mask_t     mask;
 
-       if( !isalpha(str[0]) ) {
+       if( !ASCII_ALPHA(str[0]) ) {
                int i;
 
                if ( str[0] == '=' ) {
@@ -899,6 +1077,7 @@ acl_usage( void )
 #ifdef SLAPD_ACI_ENABLED
                        "\t[aci=<attrname>]\n"
 #endif
+                       "\t[ssf=<n>] [transport_ssf=<n>] [tls_ssf=<n>] [sasl_ssf=<n>]\n"
                "<access> ::= [self]{<level>|<priv>}\n"
                "<level> ::= none | auth | compare | search | read | write\n"
                "<priv> ::= {=|+|-}{w|r|s|c|x}+\n"
@@ -991,6 +1170,15 @@ str2access( const char *str )
 
 #ifdef LDAP_DEBUG
 
+static char *style_strings[5] = {
+                       "regex",
+                       "base",
+                       "one",
+                       "subtree",
+                       "children"
+               };
+
+
 static void
 print_access( Access *b )
 {
@@ -1007,30 +1195,23 @@ print_access( Access *b )
                        fprintf( stderr, " %s", b->a_dn_pat );
 
                } else {
-                       fprintf( stderr, " dn=%s", b->a_dn_pat );
+                       fprintf( stderr, " dn.%s=%s", style_strings[b->a_dn_style], b->a_dn_pat );
                }
        }
 
        if ( b->a_dn_at != NULL ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-               fprintf( stderr, " dnattr=%s", b->a_dn_at->ad_cname->bv_val );
-#else
-               fprintf( stderr, " dnattr=%s", b->a_dn_at );
-#endif
+               fprintf( stderr, " dnattr=%s", b->a_dn_at->ad_cname.bv_val );
        }
 
        if ( b->a_group_pat != NULL ) {
-               fprintf( stderr, " group%s", b->a_group_pat );
+               fprintf( stderr, " group=%s", b->a_group_pat );
 
                if ( b->a_group_oc ) {
-                       fprintf( stderr, " objectClass: %s", b->a_group_oc );
+                       fprintf( stderr, " objectClass: %s",
+                               b->a_group_oc->soc_oclass.oc_oid );
 
                        if ( b->a_group_at ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-                               fprintf( stderr, " attributeType: %s", b->a_group_at->ad_cname->bv_val );
-#else
-                               fprintf( stderr, " attributeType: %s", b->a_group_at );
-#endif
+                               fprintf( stderr, " attributeType: %s", b->a_group_at->ad_cname.bv_val );
                        }
                }
     }
@@ -1053,17 +1234,31 @@ print_access( Access *b )
 
 #ifdef SLAPD_ACI_ENABLED
        if ( b->a_aci_at != NULL ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-               fprintf( stderr, " aci=%s", b->a_aci_at->ad_cname->bv_val );
-#else
-               fprintf( stderr, " aci=%s", b->a_aci_at );
-#endif
+               fprintf( stderr, " aci=%s", b->a_aci_at->ad_cname.bv_val );
        }
 #endif
 
+       /* Security Strength Factors */
+       if ( b->a_authz.sai_ssf ) {
+               fprintf( stderr, " ssf=%u",
+                       b->a_authz.sai_ssf );
+       }
+       if ( b->a_authz.sai_transport_ssf ) {
+               fprintf( stderr, " transport_ssf=%u",
+                       b->a_authz.sai_transport_ssf );
+       }
+       if ( b->a_authz.sai_tls_ssf ) {
+               fprintf( stderr, " tls_ssf=%u",
+                       b->a_authz.sai_tls_ssf );
+       }
+       if ( b->a_authz.sai_sasl_ssf ) {
+               fprintf( stderr, " sasl_ssf=%u",
+                       b->a_authz.sai_sasl_ssf );
+       }
+
        fprintf( stderr, " %s%s",
                b->a_dn_self ? "self" : "",
-               accessmask2str( b->a_mask, maskbuf ) );
+               accessmask2str( b->a_access_mask, maskbuf ) );
 
        if( b->a_type == ACL_BREAK ) {
                fprintf( stderr, " break" );
@@ -1090,8 +1285,8 @@ print_acl( Backend *be, AccessControl *a )
 
        if ( a->acl_dn_pat != NULL ) {
                to++;
-               fprintf( stderr, " dn=%s\n",
-                       a->acl_dn_pat );
+               fprintf( stderr, " dn.%s=%s\n",
+                       style_strings[a->acl_dn_style], a->acl_dn_pat );
        }
 
        if ( a->acl_filter != NULL ) {