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

Add -Wshadow and deal with the warnings.

Browse Source
This commit is contained in:
Roland C. Dowdeswell
2012-02-21 11:17:55 +00:00
parent cc47c8fa7b
commit e8779d5d4a
39 changed files with 214 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
kadmin/add-random-users.c
View File

@@ -77,8 +77,7 @@ read_words (const char *filename, char ***ret_w)
}
static void
add_user (krb5_context context, void *kadm_handle,
unsigned nwords, char **words)
add_user (krb5_context ctx, void *hndl, unsigned nwords, char **words)
{
kadm5_principal_ent_rec princ;
char name[64];
@@ -94,14 +93,14 @@ add_user (krb5_context context, void *kadm_handle,
mask = KADM5_PRINCIPAL;
memset(&princ, 0, sizeof(princ));
ret = krb5_parse_name(context, name, &princ.principal);
ret = krb5_parse_name(ctx, name, &princ.principal);
if (ret)
krb5_err(context, 1, ret, "krb5_parse_name");
krb5_err(ctx, 1, ret, "krb5_parse_name");
ret = kadm5_create_principal (kadm_handle, &princ, mask, name);
ret = kadm5_create_principal (hndl, &princ, mask, name);
if (ret)
krb5_err (context, 1, ret, "kadm5_create_principal");
kadm5_free_principal_ent(kadm_handle, &princ);
krb5_err (ctx, 1, ret, "kadm5_create_principal");
kadm5_free_principal_ent(hndl, &princ);
printf ("%s\n", name);
}
@@ -110,29 +109,29 @@ add_users (const char *filename, unsigned n)
{
krb5_error_code ret;
int i;
void *kadm_handle;
krb5_context context;
void *hndl;
krb5_context ctx;
unsigned nwords;
char **words;
ret = krb5_init_context(&context);
ret = krb5_init_context(&ctx);
if (ret)
errx (1, "krb5_init_context failed: %d", ret);
ret = kadm5_s_init_with_password_ctx(context,
ret = kadm5_s_init_with_password_ctx(ctx,
KADM5_ADMIN_SERVICE,
NULL,
KADM5_ADMIN_SERVICE,
NULL, 0, 0,
&kadm_handle);
&hndl);
if(ret)
krb5_err(context, 1, ret, "kadm5_init_with_password");
krb5_err(ctx, 1, ret, "kadm5_init_with_password");
nwords = read_words (filename, &words);
for (i = 0; i < n; ++i)
add_user (context, kadm_handle, nwords, words);
kadm5_destroy(kadm_handle);
krb5_free_context(context);
add_user (ctx, hndl, nwords, words);
kadm5_destroy(hndl);
krb5_free_context(ctx);
}
static int version_flag = 0;

2
kadmin/mod.c
View File

@@ -186,7 +186,7 @@ add_pkinit_acl(krb5_context contextp, kadm5_principal_ent_rec *princ,
}
static void
add_kvno_diff(krb5_context context, kadm5_principal_ent_rec *princ,
add_kvno_diff(krb5_context contextp, kadm5_principal_ent_rec *princ,
int is_svc_diff, krb5_kvno kvno_diff)
{
krb5_error_code ret;

1
kadmin/stash.c
View File

@@ -110,7 +110,6 @@ stash(struct stash_options *opt, int argc, char **argv)
{
char *new = NULL, *old = NULL;
int aret;
aret = asprintf(&old, "%s.old", opt->key_file_string);
if (aret == -1) {