diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2013-04-21 17:08:44 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2013-04-21 17:08:44 +0000 |
| commit | 891f1b61da33280fa1ba153569b360771d27e984 (patch) | |
| tree | ab52d50bcac2932bf5e37126b12ef0d2886488f1 /contrib/sendmail/src/deliver.c | |
| parent | 84dd41acc62e69379821ee9ff4d6461233543f07 (diff) | |
| parent | a03b7e14eaaeb30fff6859c589152c8787d230e3 (diff) | |
| download | FreeBSD-src-891f1b61da33280fa1ba153569b360771d27e984.zip FreeBSD-src-891f1b61da33280fa1ba153569b360771d27e984.tar.gz | |
Merge sendmail 8.14.7 to HEAD
MFC after: 4 days
Diffstat (limited to 'contrib/sendmail/src/deliver.c')
| -rw-r--r-- | contrib/sendmail/src/deliver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/sendmail/src/deliver.c b/contrib/sendmail/src/deliver.c index 581a98d..1d5eddd 100644 --- a/contrib/sendmail/src/deliver.c +++ b/contrib/sendmail/src/deliver.c @@ -14,7 +14,7 @@ #include <sendmail.h> #include <sm/time.h> -SM_RCSID("@(#)$Id: deliver.c,v 8.1027 2012/12/19 02:49:21 ca Exp $") +SM_RCSID("@(#)$Id: deliver.c,v 8.1028 2013/01/02 18:57:42 ca Exp $") #if HASSETUSERCONTEXT # include <login_cap.h> @@ -6159,7 +6159,7 @@ starttls(m, mci, e) sm_syslog(LOG_ERR, NOQID, "STARTTLS=client, error: SSL_new failed"); if (LogLevel > 9) - tlslogerr("client"); + tlslogerr(LOG_WARNING, "client"); } return EX_SOFTWARE; } @@ -6178,7 +6178,7 @@ starttls(m, mci, e) "STARTTLS=client, error: SSL_set_xfd failed=%d", result); if (LogLevel > 9) - tlslogerr("client"); + tlslogerr(LOG_WARNING, "client"); } return EX_SOFTWARE; } @@ -6208,7 +6208,7 @@ ssl_retry: result, sr == NULL ? "unknown" : sr, ssl_err, errno, i); if (LogLevel > 9) - tlslogerr("client"); + tlslogerr(LOG_WARNING, "client"); } SSL_free(clt_ssl); |
