diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2008-11-17 21:24:29 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2008-11-17 21:24:29 +0000 |
| commit | c88705c1cd8655ed4287c2e151fc654918f965e6 (patch) | |
| tree | 5a719c21a6a1366885e658ffc9efc2f4a3b1baf4 | |
| parent | 42fd2d7f8bb03054d3334cc8cad775188804f9f2 (diff) | |
| download | krb5-c88705c1cd8655ed4287c2e151fc654918f965e6.tar.gz krb5-c88705c1cd8655ed4287c2e151fc654918f965e6.tar.xz krb5-c88705c1cd8655ed4287c2e151fc654918f965e6.zip | |
Don't stick '<null>' in log messages. Run kdb5_util dump with input explicitly from /dev/null
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21132 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/kadmin/server/ipropd_svc.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c index a76057cbe8..f0b704f1a1 100644 --- a/src/kadmin/server/ipropd_svc.c +++ b/src/kadmin/server/ipropd_svc.c @@ -52,10 +52,8 @@ static char *reply_nil_str = "UPDATE_NIL"; static char *reply_perm_str = "UPDATE_PERM_DENIED"; static char *reply_unknown_str = "<UNKNOWN_CODE>"; -#define LOG_UNAUTH _("Unauthorized request: %s, %s, " \ - "client=%s, service=%s, addr=%s") -#define LOG_DONE _("Request: %s, %s, %s, client=%s, " \ - "service=%s, addr=%s") +#define LOG_UNAUTH _("Unauthorized request: %s, client=%s, service=%s, addr=%s") +#define LOG_DONE _("Request: %s, %s, %s, client=%s, service=%s, addr=%s") #ifdef DPRINT #undef DPRINT @@ -183,7 +181,7 @@ iprop_get_updates_1_svc(kdb_last_t *arg, struct svc_req *rqstp) ret.ret = UPDATE_PERM_DENIED; krb5_klog_syslog(LOG_NOTICE, LOG_UNAUTH, whoami, - "<null>", client_name, service_name, + client_name, service_name, client_addr(rqstp)); goto out; } @@ -203,7 +201,9 @@ iprop_get_updates_1_svc(kdb_last_t *arg, struct svc_req *rqstp) (unsigned long)arg->last_sno); } - krb5_klog_syslog(LOG_NOTICE, LOG_DONE, whoami, + krb5_klog_syslog(LOG_NOTICE, + _("Request: %s, %s, %s, client=%s, service=%s, addr=%s"), + whoami, obuf, ((kret == 0) ? "success" : error_message(kret)), client_name, service_name, @@ -301,7 +301,7 @@ iprop_full_resync_1_svc(/* LINTED */ void *argp, struct svc_req *rqstp) ret.ret = UPDATE_PERM_DENIED; krb5_klog_syslog(LOG_NOTICE, LOG_UNAUTH, whoami, - "<null>", client_name, service_name, + client_name, service_name, client_addr(rqstp)); goto out; } @@ -327,8 +327,8 @@ iprop_full_resync_1_svc(/* LINTED */ void *argp, struct svc_req *rqstp) * note the -i; modified version of kdb5_util dump format * to include sno (serial number) */ - if (asprintf(&ubuf, "%s dump -i %s", KPROPD_DEFAULT_KDB5_UTIL, - tmpf) < 0) { + if (asprintf(&ubuf, "%s dump -i %s </dev/null 2>&1", + KPROPD_DEFAULT_KDB5_UTIL, tmpf) < 0) { krb5_klog_syslog(LOG_ERR, _("%s: cannot construct kdb5 util dump string too long; out of memory"), whoami); @@ -403,9 +403,9 @@ iprop_full_resync_1_svc(/* LINTED */ void *argp, struct svc_req *rqstp) ret.lastentry.last_time.seconds = 0; ret.lastentry.last_time.useconds = 0; - krb5_klog_syslog(LOG_NOTICE, LOG_DONE, whoami, - "<null>", - "success", + krb5_klog_syslog(LOG_NOTICE, + _("Request: %s, spawned resync process %d, client=%s, service=%s, addr=%s"), + whoami, fret, client_name, service_name, client_addr(rqstp)); |