diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2012-05-12 15:31:44 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2012-05-12 15:31:44 +0000 |
| commit | be9319e2cbfaf9f32828d17c8e8f4241fab87d89 (patch) | |
| tree | e9f6f1d8684c144ef7727bd7038d6cee37f12926 | |
| parent | f2cab7a55cbb2eeb92d5647ed32e588787cd62e0 (diff) | |
- 'secret' -> 'credentials' in some logs
- log_warn() admin that a map that's needed by an envelope is no longer in
the configuration file
| -rw-r--r-- | usr.sbin/smtpd/lka.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c index fad0f8cce16..169662dd521 100644 --- a/usr.sbin/smtpd/lka.c +++ b/usr.sbin/smtpd/lka.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka.c,v 1.132 2012/05/12 15:29:16 gilles Exp $ */ +/* $OpenBSD: lka.c,v 1.133 2012/05/12 15:31:43 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -115,20 +115,24 @@ lka_imsg(struct imsgev *iev, struct imsg *imsg) secret = imsg->data; map = map_findbyname(secret->mapname); if (map == NULL) { + log_warn("lka: credentials map %s is missing", + secret->mapname); imsg_compose_event(iev, IMSG_LKA_SECRET, 0, 0, -1, secret, sizeof *secret); return; } map_credentials = map_lookup(map->m_id, secret->host, K_CREDENTIALS); - log_debug("lka: %s secret lookup (%d)", secret->host, + log_debug("lka: %s credentials lookup (%d)", secret->host, map_credentials != NULL); secret->secret[0] = '\0'; if (map_credentials == NULL) - log_warnx("%s secret not found", secret->host); + log_warnx("%s credentials not found", + secret->host); else if (lka_encode_credentials(secret->secret, sizeof secret->secret, map_credentials) == 0) - log_warnx("%s secret parse fail", secret->host); + log_warnx("%s credentials parse fail", + secret->host); imsg_compose_event(iev, IMSG_LKA_SECRET, 0, 0, -1, secret, sizeof *secret); free(map_credentials); |