| deliver.c (110560) | deliver.c (111823) |
|---|---|
| 1/* | 1/* |
| 2 * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. | 2 * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers. |
| 3 * All rights reserved. 4 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. 5 * Copyright (c) 1988, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * By using this file, you agree to the terms and conditions set 9 * forth in the LICENSE file which can be found at the top level of 10 * the sendmail distribution. 11 * 12 */ 13 14#include <sendmail.h> 15#include <sys/time.h> 16 | 3 * All rights reserved. 4 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. 5 * Copyright (c) 1988, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * By using this file, you agree to the terms and conditions set 9 * forth in the LICENSE file which can be found at the top level of 10 * the sendmail distribution. 11 * 12 */ 13 14#include <sendmail.h> 15#include <sys/time.h> 16 |
| 17SM_RCSID("@(#)$Id: deliver.c,v 8.940.2.10 2002/12/12 22:46:34 ca Exp $") | 17SM_RCSID("@(#)$Id: deliver.c,v 8.940.2.15 2003/02/07 17:57:43 ca Exp $") |
| 18 19#if HASSETUSERCONTEXT 20# include <login_cap.h> 21#endif /* HASSETUSERCONTEXT */ 22 23#if NETINET || NETINET6 24# include <arpa/inet.h> 25#endif /* NETINET || NETINET6 */ --- 6093 unchanged lines hidden (view full) --- 6119 FD_SET(rfd, &ssl_maskx); 6120 if (select(wfd + 1, NULL, &ssl_maskw, &ssl_maskx, &tv) 6121 > 0) 6122 goto ssl_retry; 6123 } 6124 if (LogLevel > 5) 6125 { 6126 sm_syslog(LOG_ERR, e->e_id, | 18 19#if HASSETUSERCONTEXT 20# include <login_cap.h> 21#endif /* HASSETUSERCONTEXT */ 22 23#if NETINET || NETINET6 24# include <arpa/inet.h> 25#endif /* NETINET || NETINET6 */ --- 6093 unchanged lines hidden (view full) --- 6119 FD_SET(rfd, &ssl_maskx); 6120 if (select(wfd + 1, NULL, &ssl_maskw, &ssl_maskx, &tv) 6121 > 0) 6122 goto ssl_retry; 6123 } 6124 if (LogLevel > 5) 6125 { 6126 sm_syslog(LOG_ERR, e->e_id, |
| 6127 "STARTTLS=client, error: connect failed=%d, SSL_error=%d, timedout=%d", 6128 result, i, (int) timedout); | 6127 "STARTTLS=client, error: connect failed=%d, SSL_error=%d, timedout=%d, errno=%d", 6128 result, i, (int) timedout, errno); |
| 6129 if (LogLevel > 8) 6130 tlslogerr("client"); 6131 } 6132tlsfail: 6133 SSL_free(clt_ssl); 6134 clt_ssl = NULL; 6135 return EX_SOFTWARE; 6136 } --- 67 unchanged lines hidden --- | 6129 if (LogLevel > 8) 6130 tlslogerr("client"); 6131 } 6132tlsfail: 6133 SSL_free(clt_ssl); 6134 clt_ssl = NULL; 6135 return EX_SOFTWARE; 6136 } --- 67 unchanged lines hidden --- |