From b978afa593739cd00f56cc9f5737d18e8575bc8b Mon Sep 17 00:00:00 2001 From: Eric Faurot Date: Mon, 12 Nov 2012 14:58:54 +0000 Subject: Cleanups and improvements: * Log more events (especially client session) and use a better scheme for that: each messages is prefixed with a token to easily identify its class: - info/warn/debug: general server messages - smtp-in: smtp client connections - relay: status update for relayed messages - delivery: status update for local deliveries * Implement "smtpctl monitor" to display updates of selected internal counters. * When reloading the on-disk queue at startup do not commit a message if no envelope was submitted for that message. * Remove unused stuff in the config parser. ok gilles@ --- usr.sbin/smtpd/map_db.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.sbin/smtpd/map_db.c') diff --git a/usr.sbin/smtpd/map_db.c b/usr.sbin/smtpd/map_db.c index 4e33ac6c149..afbd2e1cd1c 100644 --- a/usr.sbin/smtpd/map_db.c +++ b/usr.sbin/smtpd/map_db.c @@ -1,4 +1,4 @@ -/* $OpenBSD: map_db.c,v 1.11 2012/10/14 11:58:23 gilles Exp $ */ +/* $OpenBSD: map_db.c,v 1.12 2012/11/12 14:58:53 eric Exp $ */ /* * Copyright (c) 2011 Gilles Chehade @@ -125,7 +125,7 @@ map_db_compare(void *hdl, const char *key, enum map_kind kind, for (r = db->seq(db, &dbk, &dbd, R_FIRST); !r; r = db->seq(db, &dbk, &dbd, R_NEXT)) { buf = xmemdup(dbk.data, dbk.size + 1, "map_db_compare"); - log_debug("key: %s, buf: %s", key, buf); + log_debug("debug: key: %s, buf: %s", key, buf); if (func(key, buf)) ret = 1; free(buf); -- cgit v1.2.3