Avoid shadowing.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17580 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-05-13 21:28:56 +00:00
parent 4c970b550e
commit 0e230cfee5

View File

@@ -105,43 +105,32 @@ extern void * kadm_handle;
/* util.c */ /* util.c */
void attributes2str(krb5_flags attributes, char *str, size_t len); void attributes2str(krb5_flags, char *, size_t);
int str2attributes(const char *str, krb5_flags *flags); int str2attributes(const char *, krb5_flags *);
int parse_attributes (const char *resp, krb5_flags *attr, int *mask, int bit); int parse_attributes (const char *, krb5_flags *, int *, int);
int edit_attributes (const char *prompt, krb5_flags *attr, int *mask, int edit_attributes (const char *, krb5_flags *, int *, int);
int bit);
void time_t2str(time_t t, char *str, size_t len, int include_time); void time_t2str(time_t, char *, size_t, int);
int str2time_t (const char *str, time_t *); int str2time_t (const char *, time_t *);
int parse_timet (const char *resp, krb5_timestamp *value, int *mask, int bit); int parse_timet (const char *, krb5_timestamp *, int *, int);
int edit_timet (const char *prompt, krb5_timestamp *value, int *mask, int edit_timet (const char *, krb5_timestamp *, int *,
int bit); int);
void deltat2str(unsigned t, char *str, size_t len); void deltat2str(unsigned, char *, size_t);
int str2deltat(const char *str, krb5_deltat *delta); int str2deltat(const char *, krb5_deltat *);
int parse_deltat (const char *resp, krb5_deltat *value, int *mask, int bit); int parse_deltat (const char *, krb5_deltat *, int *, int);
int edit_deltat (const char *prompt, krb5_deltat *value, int *mask, int bit); int edit_deltat (const char *, krb5_deltat *, int *, int);
int edit_entry(kadm5_principal_ent_t ent, int *mask, int edit_entry(kadm5_principal_ent_t, int *, kadm5_principal_ent_t, int);
kadm5_principal_ent_t default_ent, int default_mask); void set_defaults(kadm5_principal_ent_t, int *, kadm5_principal_ent_t, int);
void set_defaults(kadm5_principal_ent_t ent, int *mask, int set_entry(krb5_context, kadm5_principal_ent_t, int *,
kadm5_principal_ent_t default_ent, int default_mask); const char *, const char *, const char *,
int set_entry(krb5_context context, const char *, const char *);
kadm5_principal_ent_t ent,
int *mask,
const char *max_ticket_life,
const char *max_renewable_life,
const char *expiration,
const char *pw_expiration,
const char *attributes);
int int
foreach_principal(const char *exp_str, foreach_principal(const char *, int (*)(krb5_principal, void*),
int (*func)(krb5_principal, void*), const char *, void *);
const char *funcname,
void *data);
int parse_des_key (const char *key_string, int parse_des_key (const char *, krb5_key_data *, const char **);
krb5_key_data *key_data, const char **);
/* server.c */ /* server.c */
@@ -151,7 +140,7 @@ kadmind_loop (krb5_context, krb5_auth_context, krb5_keytab, int);
/* random_password.c */ /* random_password.c */
void void
random_password(char *pw, size_t len); random_password(char *, size_t);
/* kadm_conn.c */ /* kadm_conn.c */