From d0ddf23f4fb9abfa5a2052dc3e9dc8501d7dc12b Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Mon, 14 May 2001 06:17:20 +0000 Subject: [PATCH] (foreach_principal): rely on krb5_warn to get reasonable error messages git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9939 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kadmin/util.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/kadmin/util.c b/kadmin/util.c index 937e2138a..4335a01d6 100644 --- a/kadmin/util.c +++ b/kadmin/util.c @@ -499,26 +499,8 @@ foreach_principal(const char *exp, continue; } ret = (*func)(princ_ent, data); - if(ret) { - char *tmp; - - tmp = krb5_get_error_string(context); - if (tmp != NULL) { - krb5_warnx(context, "%s: %s", funcname, tmp); - krb5_free_error_string(context, tmp); - } else { - krb5_error_code ret2; - - ret2 = krb5_unparse_name(context, princ_ent, &tmp); - if(ret2) { - krb5_warn(context, ret2, "krb5_unparse_name"); - krb5_warn(context, ret, ""); - } else { - krb5_warn(context, ret, "%s: %s", funcname, tmp); - free(tmp); - } - } - } + if(ret) + krb5_warn(context, ret, "%s %s", funcname, princs[i]); krb5_free_principal(context, princ_ent); } kadm5_free_name_list(kadm_handle, princs, &num_princs);