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

make a copy of realm and admin_server to avoid un-consting

Browse Source 
avoid shadowing


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15584 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-07-07 21:51:07 +00:00
parent b37386a686
commit 8297868729
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
admin/list.c
View File

@@ -37,7 +37,7 @@
RCSID("$Id$"); RCSID("$Id$");
static int static int
do_list(struct list_options *opt, const char *keytab_string) do_list(struct list_options *opt, const char *keytab_str)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_keytab keytab; krb5_keytab keytab;
@@ -46,12 +46,12 @@ do_list(struct list_options *opt, const char *keytab_string)
rtbl_t table; rtbl_t table;
/* XXX specialcase the ANY type */ /* XXX specialcase the ANY type */
if(strncasecmp(keytab_string, "ANY:", 4) == 0) { if(strncasecmp(keytab_str, "ANY:", 4) == 0) {
int flag = 0; int flag = 0;
char buf[1024]; char buf[1024];
keytab_string += 4; keytab_str += 4;
ret = 0; ret = 0;
while (strsep_copy((const char**)&keytab_string, ",", while (strsep_copy((const char**)&keytab_str, ",",
buf, sizeof(buf)) != -1) { buf, sizeof(buf)) != -1) {
if(flag) if(flag)
printf("\n"); printf("\n");
@@ -62,20 +62,20 @@ do_list(struct list_options *opt, const char *keytab_string)
return ret; return ret;
} }
ret = krb5_kt_resolve(context, keytab_string, &keytab); ret = krb5_kt_resolve(context, keytab_str, &keytab);
if (ret) { if (ret) {
krb5_warn(context, ret, "resolving keytab %s", keytab_string); krb5_warn(context, ret, "resolving keytab %s", keytab_str);
return ret; return ret;
} }
ret = krb5_kt_start_seq_get(context, keytab, &cursor); ret = krb5_kt_start_seq_get(context, keytab, &cursor);
if(ret) { if(ret) {
krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string); krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_str);
krb5_kt_close(context, keytab); krb5_kt_close(context, keytab);
return ret; return ret;
} }
printf ("%s:\n\n", keytab_string); printf ("%s:\n\n", keytab_str);
table = rtbl_create(); table = rtbl_create();
rtbl_add_column_by_id(table, 0, "Vno", RTBL_ALIGN_RIGHT); rtbl_add_column_by_id(table, 0, "Vno", RTBL_ALIGN_RIGHT);