oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Avoid shadowing exp().

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15893 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-08-11 13:53:24 +00:00
parent f2cd11a998
commit e478a72278
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kadmin/server.c
View File

@@ -47,7 +47,7 @@ kadmind_dispatch(void *kadm_handle, krb5_boolean initial,
char *op = ""; char *op = "";
krb5_principal princ, princ2; krb5_principal princ, princ2;
kadm5_principal_ent_rec ent; kadm5_principal_ent_rec ent;
char *password, *exp; char *password, *expression;
krb5_keyblock *new_keys; krb5_keyblock *new_keys;
int n_keys; int n_keys;
char **princs; char **princs;
@@ -384,19 +384,20 @@ kadmind_dispatch(void *kadm_handle, krb5_boolean initial,
if(ret) if(ret)
goto fail; goto fail;
if(tmp){ if(tmp){
ret = krb5_ret_string(sp, &exp); ret = krb5_ret_string(sp, &expression);
if(ret) if(ret)
goto fail; goto fail;
}else }else
exp = NULL; expression = NULL;
krb5_warnx(context->context, "%s: %s %s", client, op, exp ? exp : "*"); krb5_warnx(context->context, "%s: %s %s", client, op,
expression ? expression : "*");
ret = _kadm5_acl_check_permission(context, KADM5_PRIV_LIST, NULL); ret = _kadm5_acl_check_permission(context, KADM5_PRIV_LIST, NULL);
if(ret){ if(ret){
free(exp); free(expression);
goto fail; goto fail;
} }
ret = kadm5_get_principals(kadm_handle, exp, &princs, &n_princs); ret = kadm5_get_principals(kadm_handle, expression, &princs, &n_princs);
free(exp); free(expression);
krb5_storage_free(sp); krb5_storage_free(sp);
sp = krb5_storage_emem(); sp = krb5_storage_emem();
krb5_store_int32(sp, ret); krb5_store_int32(sp, ret);