reject registrations when back-monitor is not configured

[openldap] / servers / slapd / aclparse.c

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index b1760206ffa8092121459363cd1a52cedb4aa798..258917a639080e0ce031374d6b72f6f30c72a29c 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -70,7 +70,14 @@ static int           check_scope( BackendDB *be, AccessControl *a );
 
 #ifdef SLAP_DYNACL
 static int
-slap_dynacl_config( const char *fname, int lineno, Access *b, const char *name, slap_style_t sty, const char *right )
+slap_dynacl_config(
+       const char *fname,
+       int lineno,
+       Access *b,
+       const char *name,
+       const char *opts,
+       slap_style_t sty,
+       const char *right )
 {
        slap_dynacl_t   *da, *tmp;
        int             rc = 0;
@@ -93,7 +100,7 @@ slap_dynacl_config( const char *fname, int lineno, Access *b, const char *name,
        *tmp = *da;
 
        if ( tmp->da_parse ) {
-               rc = ( *tmp->da_parse )( fname, lineno, sty, right, &tmp->da_private );
+               rc = ( *tmp->da_parse )( fname, lineno, opts, sty, right, &tmp->da_private );
                if ( rc ) {
                        ch_free( tmp );
                        return rc;
@@ -961,12 +968,12 @@ parse_acl(
                                                        fprintf( stderr,
                                                                "%s: line %d: \"onelevel\" should be used "
                                                                "instead of \"level{1}\" in by DN clause\n",
-                                                               fname, lineno, 0 );
+                                                               fname, lineno );
                                                } else if ( level == 0 && sty == ACL_STYLE_LEVEL ) {
                                                        fprintf( stderr,
                                                                "%s: line %d: \"base\" should be used "
                                                                "instead of \"level{0}\" in by DN clause\n",
-                                                               fname, lineno, 0 );
+                                                               fname, lineno );
                                                }
 
                                                bdn->a_level = level;
@@ -1034,7 +1041,7 @@ parse_acl(
                                                fprintf( stderr, "%s: line %d: "
                                                        "deprecated group style \"regex\"; "
                                                        "use \"expand\" instead\n",
-                                                       fname, lineno, style );
+                                                       fname, lineno );
                                                sty = ACL_STYLE_EXPAND;
                                                break;
 
@@ -1109,7 +1116,7 @@ parse_acl(
                                                }
 
                                        } else {
-                                               b->a_group_oc = oc_find(SLAPD_GROUP_CLASS);
+                                               b->a_group_oc = oc_find( SLAPD_GROUP_CLASS );
 
                                                if( b->a_group_oc == NULL ) {
                                                        fprintf( stderr,
@@ -1490,17 +1497,23 @@ parse_acl(
 
 #ifdef SLAP_DYNACL
                                {
-                                       char            *name = NULL;
+                                       char            *name = NULL,
+                                                       *opts = NULL;
                                        
                                        if ( strcasecmp( left, "aci" ) == 0 ) {
                                                name = "aci";
                                                
                                        } else if ( strncasecmp( left, "dynacl/", STRLENOF( "dynacl/" ) ) == 0 ) {
                                                name = &left[ STRLENOF( "dynacl/" ) ];
+                                               opts = strchr( name, '/' );
+                                               if ( opts ) {
+                                                       opts[ 0 ] = '\0';
+                                                       opts++;
+                                               }
                                        }
 
                                        if ( name ) {
-                                               if ( slap_dynacl_config( fname, lineno, b, name, sty, right ) ) {
+                                               if ( slap_dynacl_config( fname, lineno, b, name, opts, sty, right ) ) {
                                                        fprintf( stderr, "%s: line %d: "
                                                                "unable to configure dynacl \"%s\"\n",
                                                                fname, lineno, name );
@@ -1539,7 +1552,7 @@ parse_acl(
                                                }
 
                                        } else {
-                                               b->a_aci_at = slap_schema.si_ad_aci;
+                                               b->a_aci_at = slap_ad_aci;
                                        }
 
                                        if( !is_at_syntax( b->a_aci_at->ad_type,
@@ -2118,12 +2131,13 @@ acl_usage( void )
                        "\t[group[/<objectclass>[/<attrname>]][.<style>]=<group>]\n"
                        "\t[peername[.<peernamestyle>]=<peer>] [sockname[.<style>]=<name>]\n"
                        "\t[domain[.<domainstyle>]=<domain>] [sockurl[.<style>]=<url>]\n"
-#ifdef SLAPD_ACI_ENABLED
-                       "\t[aci=[<attrname>]]\n"
-#endif
 #ifdef SLAP_DYNACL
-                       "\t[dynacl/<name>[.<dynstyle>][=<pattern>]]\n"
-#endif /* SLAP_DYNACL */
+                       "\t[dynacl/<name>[/<options>][.<dynstyle>][=<pattern>]]\n"
+#else /* ! SLAP_DYNACL */
+#ifdef SLAPD_ACI_ENABLED
+                       "\t[aci[=<attrname>]]\n"
+#endif /* SLAPD_ACI_ENABLED */
+#endif /* ! SLAP_DYNACL */
                        "\t[ssf=<n>] [transport_ssf=<n>] [tls_ssf=<n>] [sasl_ssf=<n>]\n",
                "<style> ::= exact | regex | base(Object)\n"
                "<dnstyle> ::= base(Object) | one(level) | sub(tree) | children | "
@@ -2136,6 +2150,12 @@ acl_usage( void )
                "<level> ::= none|disclose|auth|compare|search|read|{write|add|delete}|manage\n"
                "<priv> ::= {=|+|-}{0|d|x|c|s|r|{w|a|z}|m}+\n"
                "<control> ::= [ stop | continue | break ]\n"
+#ifdef SLAP_DYNACL
+#ifdef SLAPD_ACI_ENABLED
+               "dynacl:\n"
+               "\t<name>=ACI\t<pattern>=<attrname>\n"
+#endif /* SLAPD_ACI_ENABLED */
+#endif /* ! SLAP_DYNACL */
        );
        exit( EXIT_FAILURE );
 }
@@ -2250,6 +2270,22 @@ access_free( Access *a )
        if ( !BER_BVISNULL( &a->a_group_pat ) ) {
                free( a->a_group_pat.bv_val );
        }
+#ifdef SLAP_DYNACL
+       if ( a->a_dynacl != NULL ) {
+               slap_dynacl_t   *da;
+               for ( da = a->a_dynacl; da; ) {
+                       slap_dynacl_t   *tmp = da;
+
+                       da = da->da_next;
+
+                       if ( tmp->da_destroy ) {
+                               tmp->da_destroy( tmp->da_private );
+                       }
+
+                       ch_free( tmp );
+               }
+       }
+#endif /* SLAP_DYNACL */
        free( a );
 }
 
@@ -2263,6 +2299,9 @@ acl_free( AccessControl *a )
                filter_free( a->acl_filter );
        }
        if ( !BER_BVISNULL( &a->acl_dn_pat ) ) {
+               if ( a->acl_dn_style == ACL_STYLE_REGEX ) {
+                       regfree( &a->acl_dn_re );
+               }
                free ( a->acl_dn_pat.bv_val );
        }
        if ( a->acl_attrs ) {
@@ -2290,7 +2329,7 @@ acl_destroy( AccessControl *a, AccessControl *end )
 {
        AccessControl *n;
 
-       for (; a && a!= end; a=n) {
+       for ( ; a && a != end; a = n ) {
                n = a->acl_next;
                acl_free( a );
        }
@@ -2454,10 +2493,10 @@ access2text( Access *b, char *ptr )
        if ( !BER_BVISEMPTY( &b->a_group_pat ) ) {
                ptr = lutil_strcopy( ptr, " group/" );
                ptr = lutil_strcopy( ptr, b->a_group_oc ?
-                       b->a_group_oc->soc_cname.bv_val : "groupOfNames" );
+                       b->a_group_oc->soc_cname.bv_val : SLAPD_GROUP_CLASS );
                *ptr++ = '/';
                ptr = lutil_strcopy( ptr, b->a_group_at ?
-                       b->a_group_at->ad_cname.bv_val : "member" );
+                       b->a_group_at->ad_cname.bv_val : SLAPD_GROUP_ATTR );
                *ptr++ = '.';
                ptr = lutil_strcopy( ptr, style_strings[b->a_group_style] );
                *ptr++ = '=';
@@ -2523,8 +2562,9 @@ access2text( Access *b, char *ptr )
 
                for ( da = b->a_dynacl; da; da = da->da_next ) {
                        if ( da->da_unparse ) {
-                               struct berval bv;
+                               struct berval bv = BER_BVNULL;
                                (void)( *da->da_unparse )( da->da_private, &bv );
+                               assert( !BER_BVISNULL( &bv ) );
                                ptr = lutil_strcopy( ptr, bv.bv_val );
                                ch_free( bv.bv_val );
                        }