fix arbitrary precision number display when no big number library is available

[openldap] / servers / slapd / acl.c

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index c456a82742601c73d418bcfda49469495fee9884..b675717390659f6464a18cd4e2444dd54fc03835 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -166,7 +166,7 @@ slap_access_always_allowed(
        AccessControlState      *state,
        slap_mask_t             *maskp )
 {
-       assert( maskp );
+       assert( maskp != NULL );
 
        ACL_PRIV_SET( *maskp, ACL_ACCESS2PRIV( access ) );
 
@@ -373,7 +373,6 @@ access_allowed_mask(
        const char                      *attr;
        int                             st_same_attr = 0;
        static AccessControlState       state_init = ACL_STATE_INIT;
-       BI_access_allowed               *bi_access_allowed = NULL;
 
        assert( e != NULL );
        assert( desc != NULL );
@@ -881,7 +880,7 @@ slap_acl_get(
 
                        if( state && !( state->as_recorded & ACL_STATE_RECORDED_VD )) {
                                state->as_recorded |= ACL_STATE_RECORDED_VD;
-                               state->as_vd_acl = prev;
+                               state->as_vd_acl = a;
                                state->as_vd_acl_count = *count;
                                state->as_vd_access = a->acl_access;
                                state->as_vd_access_count = 1;
@@ -906,7 +905,7 @@ slap_acl_get(
        
                                if ( a->acl_attrs[0].an_desc->ad_type->sat_syntax != slap_schema.si_syn_distinguishedName ) {
                                        if (value_match( &match, desc,
-                                               desc->ad_type->sat_equality, 0,
+                                               /* desc->ad_type->sat_equality */ a->acl_attrval_mr, 0,
                                                val, &a->acl_attrval, &text ) != LDAP_SUCCESS ||
                                                        match )
                                                continue;
@@ -3173,7 +3172,7 @@ dynacl_aci_parse( const char *fname, int lineno, slap_style_t sty, const char *r
        if ( sty != ACL_STYLE_REGEX && sty != ACL_STYLE_BASE ) {
                fprintf( stderr, "%s: line %d: "
                        "inappropriate style \"%s\" in \"aci\" by clause\n",
-                       fname, lineno, sty );
+                       fname, lineno, style_strings[sty] );
                return -1;
        }
 
@@ -3208,7 +3207,7 @@ dynacl_aci_unparse( void *priv, struct berval *bv )
        AttributeDescription    *ad = ( AttributeDescription * )priv;
        char *ptr;
 
-       assert( ad );
+       assert( ad != NULL );
 
        bv->bv_val = ch_malloc( STRLENOF(" aci=") + ad->ad_cname.bv_len + 1 );
        ptr = lutil_strcopy( bv->bv_val, " aci=" );