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

Don't retrieve principal data for kadmin list

Browse Source 
kadmin list and kadmin get -t used the same output display logic
as short output, which meant that they called kadm5_get_principal
for each principal.  However, they then just threw that output
away since the terse format displays only the principal name.

For terse get output, instead use a separate set of functions that
just print the string version of the principal name and do not
retrieve additional information.

Signed-off-by: Love Hornquist Astrand <lha@h5l.org>
This commit is contained in:
Russ Allbery
2010-09-01 22:46:14 -07:00
committed by Love Hornquist Astrand
parent d893207413
commit 890c797f68
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
kadmin/get.c
View File

@@ -419,9 +419,35 @@ setup_columns(struct get_entry_data *data, const char *column_info)
return 0; return 0;
} }
static int
do_list_entry(krb5_principal principal, void *data)
{
char buf[1024];
krb5_error_code ret;
ret = krb5_unparse_name_fixed_short(context, principal, buf, sizeof(buf));
if (ret != 0)
return ret;
printf("%s\n", buf);
return 0;
}
static int
listit(const char *funcname, int argc, char **argv)
{
int i;
krb5_error_code ret, saved_ret = 0;
for (i = 0; i < argc; i++) {
ret = foreach_principal(argv[i], do_list_entry, funcname, NULL);
if (saved_ret == 0 && ret != 0)
saved_ret = ret;
}
return saved_ret != 0;
}
#define DEFAULT_COLUMNS_SHORT "principal,princ_expire_time,pw_expiration,last_pwd_change,max_life,max_rlife" #define DEFAULT_COLUMNS_SHORT "principal,princ_expire_time,pw_expiration,last_pwd_change,max_life,max_rlife"
#define DEFAULT_COLUMNS_LONG "principal,princ_expire_time,pw_expiration,last_pwd_change,max_life,max_rlife,kvno,mkvno,last_success,last_failed,fail_auth_count,mod_time,mod_name,attributes,keytypes,pkinit-acl,aliases" #define DEFAULT_COLUMNS_LONG "principal,princ_expire_time,pw_expiration,last_pwd_change,max_life,max_rlife,kvno,mkvno,last_success,last_failed,fail_auth_count,mod_time,mod_name,attributes,keytypes,pkinit-acl,aliases"
#define DEFAULT_COLUMNS_TERSE "principal="
static int static int
getit(struct get_options *opt, const char *name, int argc, char **argv) getit(struct get_options *opt, const char *name, int argc, char **argv)
@@ -439,13 +465,16 @@ getit(struct get_options *opt, const char *name, int argc, char **argv)
if(opt->long_flag == 0 && opt->short_flag == 0 && opt->terse_flag == 0) if(opt->long_flag == 0 && opt->short_flag == 0 && opt->terse_flag == 0)
opt->short_flag = 1; opt->short_flag = 1;
if (opt->terse_flag)
return listit(name, argc, argv);
data.table = NULL; data.table = NULL;
data.chead = NULL; data.chead = NULL;
data.ctail = &data.chead; data.ctail = &data.chead;
data.mask = 0; data.mask = 0;
data.extra_mask = 0; data.extra_mask = 0;
if(opt->short_flag || opt->terse_flag) { if(opt->short_flag) {
data.table = rtbl_create(); data.table = rtbl_create();
rtbl_set_separator(data.table, " "); rtbl_set_separator(data.table, " ");
data.format = print_entry_short; data.format = print_entry_short;
@@ -454,12 +483,8 @@ getit(struct get_options *opt, const char *name, int argc, char **argv)
if(opt->column_info_string == NULL) { if(opt->column_info_string == NULL) {
if(opt->long_flag) if(opt->long_flag)
ret = setup_columns(&data, DEFAULT_COLUMNS_LONG); ret = setup_columns(&data, DEFAULT_COLUMNS_LONG);
else if(opt->short_flag) else
ret = setup_columns(&data, DEFAULT_COLUMNS_SHORT); ret = setup_columns(&data, DEFAULT_COLUMNS_SHORT);
else {
ret = setup_columns(&data, DEFAULT_COLUMNS_TERSE);
rtbl_set_flags(data.table, RTBL_HEADER_STYLE_NONE);
}
} else } else
ret = setup_columns(&data, opt->column_info_string); ret = setup_columns(&data, opt->column_info_string);