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

bx509: Add proper logging

Browse Source
This commit is contained in:
Nicolas Williams
2019-12-10 17:24:09 -06:00
parent 58848fce7b
commit 18df68d6e9
4 changed files with 396 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kdc/Makefile.am
View File

@@ -36,6 +36,7 @@ bx509d_LDADD = -ldl \
libkdc.la \ libkdc.la \
$(MICROHTTPD_LIBS) \ $(MICROHTTPD_LIBS) \
$(LIB_roken) \ $(LIB_roken) \
$(LIB_heimbase) \
$(top_builddir)/lib/sl/libsl.la \ $(top_builddir)/lib/sl/libsl.la \
$(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/asn1/libasn1.la \
$(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/krb5/libkrb5.la \

725
kdc/bx509d.c
View File

File diff suppressed because it is too large Load Diff

11
kdc/process.c
View File

@@ -133,12 +133,14 @@ _kdc_audit_trail(kdc_request_t r, krb5_error_code ret)
{ {
const char *retval; const char *retval;
char kvbuf[1024]; char kvbuf[1024];
char retvalbuf[30]; /* Enough for UNKNOWN-%d */
size_t nelem; size_t nelem;
size_t i, j; size_t i, j;
#define CASE(x) case x : retval = #x; break #define CASE(x) case x : retval = #x; break
switch (ret) { switch (ret) {
CASE(ENOMEM); CASE(ENOMEM);
CASE(EACCES);
CASE(HDB_ERR_NOT_FOUND_HERE); CASE(HDB_ERR_NOT_FOUND_HERE);
CASE(HDB_ERR_WRONG_REALM); CASE(HDB_ERR_WRONG_REALM);
CASE(HDB_ERR_EXISTS); CASE(HDB_ERR_EXISTS);
@@ -169,7 +171,8 @@ _kdc_audit_trail(kdc_request_t r, krb5_error_code ret)
retval = "SUCCESS"; retval = "SUCCESS";
break; break;
default: default:
retval = "UNKNOWN"; (void) snprintf(retvalbuf, sizeof(retvalbuf), "UNKNOWN-%d", ret);
retval = retvalbuf;
break; break;
} }
@@ -203,8 +206,10 @@ _kdc_audit_trail(kdc_request_t r, krb5_error_code ret)
kvbuf[j] = '\0'; kvbuf[j] = '\0';
kdc_log(r->context, r->config, 3, "%s %s %s %s %s%s", kdc_log(r->context, r->config, 3, "%s %s %s %s %s%s",
r->reqtype, retval, r->from, r->cname, r->reqtype, retval, r->from,
r->sname, kvbuf); r->cname ? r->cname : "<unknown>",
r->sname ? r->sname : "<unknown>",
kvbuf);
} }
void void

2
tests/kdc/check-bx509.in
View File

@@ -421,7 +421,7 @@ ${kadmin} ext_keytab -r -k $keytab HTTP/${server}@${R} || exit 1
${kadmin} add -r --use-defaults HTTP/${otherserver}@${R} || exit 1 ${kadmin} add -r --use-defaults HTTP/${otherserver}@${R} || exit 1
${kadmin} ext_keytab -r -k $ukeytab foo@${R} || exit 1 ${kadmin} ext_keytab -r -k $ukeytab foo@${R} || exit 1
echo "Starting kdc" ; > messages.log echo "Starting kdc";
${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; } ${kdc} --detach --testing || { echo "kdc failed to start"; exit 1; }
kdcpid=`getpid kdc` kdcpid=`getpid kdc`
trap "kill -9 ${kdcpid} ${bx509pid}; echo signal killing kdc and bx509d; exit 1;" EXIT trap "kill -9 ${kdcpid} ${bx509pid}; echo signal killing kdc and bx509d; exit 1;" EXIT