Deleted Added
full compact
readcf.c (98841) readcf.c (102528)
1/*
2 * Copyright (c) 1998-2002 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
1/*
2 * Copyright (c) 1998-2002 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
16SM_RCSID("@(#)$Id: readcf.c,v 8.607 2002/06/14 16:57:32 ca Exp $")
16SM_RCSID("@(#)$Id: readcf.c,v 8.607.2.2 2002/08/19 21:50:49 gshapiro Exp $")
17
18#if NETINET || NETINET6
19# include <arpa/inet.h>
20#endif /* NETINET || NETINET6 */
21
22#define SECONDS
23#define MINUTES * 60
24#define HOUR * 3600

--- 2009 unchanged lines hidden (view full) ---

2034 { "LDAPDefaultSpec", O_LDAPDEFAULTSPEC, OI_NONE },
2035#if _FFR_QUEUEDELAY
2036# define O_QUEUEDELAY 0xb3
2037 { "QueueDelay", O_QUEUEDELAY, OI_NONE },
2038#endif /* _FFR_QUEUEDELAY */
2039#define O_SRVCERTFILE 0xb4
2040 { "ServerCertFile", O_SRVCERTFILE, OI_NONE },
2041#define O_SRVKEYFILE 0xb5
17
18#if NETINET || NETINET6
19# include <arpa/inet.h>
20#endif /* NETINET || NETINET6 */
21
22#define SECONDS
23#define MINUTES * 60
24#define HOUR * 3600

--- 2009 unchanged lines hidden (view full) ---

2034 { "LDAPDefaultSpec", O_LDAPDEFAULTSPEC, OI_NONE },
2035#if _FFR_QUEUEDELAY
2036# define O_QUEUEDELAY 0xb3
2037 { "QueueDelay", O_QUEUEDELAY, OI_NONE },
2038#endif /* _FFR_QUEUEDELAY */
2039#define O_SRVCERTFILE 0xb4
2040 { "ServerCertFile", O_SRVCERTFILE, OI_NONE },
2041#define O_SRVKEYFILE 0xb5
2042 { "Serverkeyfile", O_SRVKEYFILE, OI_NONE },
2042 { "ServerKeyFile", O_SRVKEYFILE, OI_NONE },
2043#define O_CLTCERTFILE 0xb6
2044 { "ClientCertFile", O_CLTCERTFILE, OI_NONE },
2045#define O_CLTKEYFILE 0xb7
2043#define O_CLTCERTFILE 0xb6
2044 { "ClientCertFile", O_CLTCERTFILE, OI_NONE },
2045#define O_CLTKEYFILE 0xb7
2046 { "Clientkeyfile", O_CLTKEYFILE, OI_NONE },
2046 { "ClientKeyFile", O_CLTKEYFILE, OI_NONE },
2047#define O_CACERTFILE 0xb8
2048 { "CACERTFile", O_CACERTFILE, OI_NONE },
2049#define O_CACERTPATH 0xb9
2050 { "CACERTPath", O_CACERTPATH, OI_NONE },
2051#define O_DHPARAMS 0xba
2052 { "DHParameters", O_DHPARAMS, OI_NONE },
2053#define O_INPUTMILTER 0xbb
2054 { "InputMailFilters", O_INPUTMILTER, OI_NONE },

--- 2041 unchanged lines hidden (view full) ---

4096 TimeOuts.to_q_return[TOC_URGENT] = toval;
4097 break;
4098
4099 case TO_QUEUERETURN_NON_URGENT:
4100 toval = convtime(val, 'd');
4101 TimeOuts.to_q_return[TOC_NONURGENT] = toval;
4102 break;
4103
2047#define O_CACERTFILE 0xb8
2048 { "CACERTFile", O_CACERTFILE, OI_NONE },
2049#define O_CACERTPATH 0xb9
2050 { "CACERTPath", O_CACERTPATH, OI_NONE },
2051#define O_DHPARAMS 0xba
2052 { "DHParameters", O_DHPARAMS, OI_NONE },
2053#define O_INPUTMILTER 0xbb
2054 { "InputMailFilters", O_INPUTMILTER, OI_NONE },

--- 2041 unchanged lines hidden (view full) ---

4096 TimeOuts.to_q_return[TOC_URGENT] = toval;
4097 break;
4098
4099 case TO_QUEUERETURN_NON_URGENT:
4100 toval = convtime(val, 'd');
4101 TimeOuts.to_q_return[TOC_NONURGENT] = toval;
4102 break;
4103
4104
4105 case TO_HOSTSTATUS:
4106 MciInfoTimeout = toval;
4107 break;
4108
4109 case TO_RESOLVER_RETRANS:
4110 toval = convtime(val, 's');
4111 TimeOuts.res_retrans[RES_TO_DEFAULT] = toval;
4112 TimeOuts.res_retrans[RES_TO_FIRST] = toval;

--- 194 unchanged lines hidden ---
4104 case TO_HOSTSTATUS:
4105 MciInfoTimeout = toval;
4106 break;
4107
4108 case TO_RESOLVER_RETRANS:
4109 toval = convtime(val, 's');
4110 TimeOuts.res_retrans[RES_TO_DEFAULT] = toval;
4111 TimeOuts.res_retrans[RES_TO_FIRST] = toval;

--- 194 unchanged lines hidden ---