diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-03-05 04:29:24 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-03-05 04:29:24 +0000 |
| commit | b352660e243c7b9b7d050f1c38cff1c9faf278b1 (patch) | |
| tree | ede08019beb931c3206609ab2377a015d510bdb4 /ldap/servers/plugins/acl/acl.c | |
| parent | f08951680ddfebc3f3df07e720ad0650fe473c0f (diff) | |
| download | ds-b352660e243c7b9b7d050f1c38cff1c9faf278b1.tar.gz ds-b352660e243c7b9b7d050f1c38cff1c9faf278b1.tar.xz ds-b352660e243c7b9b7d050f1c38cff1c9faf278b1.zip | |
clean up sprintf usage and many other flawfinder issues; clean up compiler warnings on Linux; remove pam_passthru from DS 7.1
Diffstat (limited to 'ldap/servers/plugins/acl/acl.c')
| -rw-r--r-- | ldap/servers/plugins/acl/acl.c | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/ldap/servers/plugins/acl/acl.c b/ldap/servers/plugins/acl/acl.c index 24848efa..4e21c31d 100644 --- a/ldap/servers/plugins/acl/acl.c +++ b/ldap/servers/plugins/acl/acl.c @@ -35,7 +35,7 @@ static char *ds_map_generic[2] = { NULL, NULL }; /****************************************************************************/ static int acl__resource_match_aci(struct acl_pblock *aclpb, aci_t *aci , int skip_attrEval, int *a_matched); -static acl__TestRights(Acl_PBlock *aclpb,int access, char **right, +static int acl__TestRights(Acl_PBlock *aclpb,int access, char **right, char ** map_generic, aclResultReason_t *result_reason); static int acl__scan_for_acis(struct acl_pblock *aclpb, int *err); static void acl__reset_cached_result (struct acl_pblock *aclpb ); @@ -43,7 +43,6 @@ static int acl__scan_match_handles ( struct acl_pblock *aclpb, int type); static int acl__attr_cached_result (struct acl_pblock *aclpb, char *attr, int access ); static int acl__match_handlesFromCache (struct acl_pblock *aclpb, char *attr, int access); static int acl__get_attrEval ( struct acl_pblock *aclpb, char *attr ); -static int acl__config_get_readonly (); static int acl__recompute_acl (Acl_PBlock *aclpb, AclAttrEval *a_eval, int access, int aciIndex); static void __acl_set_aclIndex_inResult ( Acl_PBlock *aclpb, @@ -991,8 +990,7 @@ acl_read_access_allowed_on_entry ( slapi_ch_free ( (void **) &aclpb->aclpb_Evalattr); aclpb->aclpb_Evalattr = slapi_ch_malloc(len); } - strncpy (aclpb->aclpb_Evalattr, attr_type, len); - aclpb->aclpb_Evalattr[len] = '\0'; + PL_strncpyz (aclpb->aclpb_Evalattr, attr_type, len); if ( attr_index >= 0 ) { /* * access was granted to one of the user specified attributes @@ -3872,34 +3870,6 @@ acl_regen_aclsignature () } - -static int -acl__handle_config_entry (Slapi_Entry *e, void *callback_data ) -{ - - int *value = (int *) callback_data; - - *value = slapi_entry_attr_get_int( e, "nsslapd-readonly"); - - return 0; -} - -static int -acl__config_get_readonly () -{ - - int readonly = 0; - - slapi_search_internal_callback( "cn=config", LDAP_SCOPE_BASE, "(objectclass=*)", - NULL, 0 /* attrsonly */, - &readonly/* callback_data */, - NULL /* controls */, - NULL /* result_callback */, - acl__handle_config_entry, - NULL /* referral_callback */); - - return readonly; -} /* * * Assumptions: |