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

collect enctype printing into one statement

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24560 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-01-31 21:07:13 +00:00
parent b0efabeb79
commit 065ff8fae9
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kdc/kerberos5.c
View File

@@ -712,10 +712,12 @@ log_as_req(krb5_context context,
const KDC_REQ_BODY *b) const KDC_REQ_BODY *b)
{ {
krb5_error_code ret; krb5_error_code ret;
struct rk_strpool *p = NULL; struct rk_strpool *p;
char *str; char *str;
int i; int i;
p = rk_strpoolprintf(NULL, "%s", "Client supported enctypes: ");
for (i = 0; i < b->etype.len; i++) { for (i = 0; i < b->etype.len; i++) {
ret = krb5_enctype_to_string(context, b->etype.val[i], &str); ret = krb5_enctype_to_string(context, b->etype.val[i], &str);
if (ret == 0) { if (ret == 0) {
@@ -733,10 +735,6 @@ log_as_req(krb5_context context,
if (p == NULL) if (p == NULL)
p = rk_strpoolprintf(p, "no encryption types"); p = rk_strpoolprintf(p, "no encryption types");
str = rk_strpoolcollect(p);
kdc_log(context, config, 0, "Client supported enctypes: %s", str);
free(str);
{ {
char *cet; char *cet;
char *set; char *set;
@@ -745,21 +743,26 @@ log_as_req(krb5_context context,
if(ret == 0) { if(ret == 0) {
ret = krb5_enctype_to_string(context, setype, &set); ret = krb5_enctype_to_string(context, setype, &set);
if (ret == 0) { if (ret == 0) {
kdc_log(context, config, 5, "Using %s/%s", cet, set); p = rk_strpoolprintf(p, ", using %s/%s", cet, set);
free(set); free(set);
} }
free(cet); free(cet);
} }
if (ret != 0) if (ret != 0)
kdc_log(context, config, 5, "Using e-types %d/%d", cetype, setype); p = rk_strpoolprintf(p, ", using enctypes %d/%d",
cetype, setype);
} }
str = rk_strpoolcollect(p);
kdc_log(context, config, 0, "%s", str);
free(str);
{ {
char fixedstr[128]; char fixedstr[128];
unparse_flags(KDCOptions2int(b->kdc_options), asn1_KDCOptions_units(), unparse_flags(KDCOptions2int(b->kdc_options), asn1_KDCOptions_units(),
fixedstr, sizeof(fixedstr)); fixedstr, sizeof(fixedstr));
if(*fixedstr) if(*fixedstr)
kdc_log(context, config, 2, "Requested flags: %s", fixedstr); kdc_log(context, config, 0, "Requested flags: %s", fixedstr);
} }
} }