diff options
| author |   gilles <gilles@openbsd.org> | 2008-11-13 23:24:19 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2008-11-13 23:24:19 +0000 |
| commit | b17530c9033d234ffda1d22f33168a1f77e46619 (patch) | |
| tree | 2357dea49a8cf481fab4566fb116e753c6430373 | |
| parent | Backout previous commit, there are still some issues with it. (diff) | |
| download | wireguard-openbsd-b17530c9033d234ffda1d22f33168a1f77e46619.tar.xz wireguard-openbsd-b17530c9033d234ffda1d22f33168a1f77e46619.zip | |
- rephrase the "cannot load cert" warning that is output at startup when a
listen directive has no matching certificate. it sounds like a
critical failure when it just means "no tls support".
- minor log_debug() addition in smtp.c
| -rw-r--r-- | usr.sbin/smtpd/parse.y | 5 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtp.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index ab0deccb8c9..38f220a2b0e 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.8 2008/11/10 22:35:23 gilles Exp $ */ +/* $OpenBSD: parse.y,v 1.9 2008/11/13 23:24:19 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -238,7 +238,8 @@ main : QUEUE INTERVAL interval { flags = 0; if (ssl_load_certfile(conf, cert) < 0) { - log_warnx("could not load cert: %s", cert); + log_warnx("warning: could not load cert: %s," + "no SSL/TLS support", cert); if ($1 || $6 != NULL) { yyerror("cannot load certificate: %s", cert); diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c index b49284439db..268494f17ff 100644 --- a/usr.sbin/smtpd/smtp.c +++ b/usr.sbin/smtpd/smtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtp.c,v 1.4 2008/11/11 02:14:58 tedu Exp $ */ +/* $OpenBSD: smtp.c,v 1.5 2008/11/13 23:24:19 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -552,6 +552,7 @@ smtp_accept(int fd, short event, void *p) return; } + log_debug("smtp_accept: accepted client on listener: %p", l); if ((s = calloc(1, sizeof(*s))) == NULL) fatal(NULL); len = sizeof(s->s_ss); |