git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7816e25
)
Renamed SOCKLEN_T as EXIM_SOCKLEN_T to avoid a problem in AIX.
author
Philip Hazel
<ph10@hermes.cam.ac.uk>
Tue, 15 Mar 2005 14:09:12 +0000
(14:09 +0000)
committer
Philip Hazel
<ph10@hermes.cam.ac.uk>
Tue, 15 Mar 2005 14:09:12 +0000
(14:09 +0000)
doc/doc-txt/ChangeLog
patch
|
blob
|
history
src/OS/os.h-OSF1
patch
|
blob
|
history
src/OS/os.h-SCO
patch
|
blob
|
history
src/OS/os.h-SCO_SV
patch
|
blob
|
history
src/OS/os.h-SunOS5
patch
|
blob
|
history
src/OS/os.h-Unixware7
patch
|
blob
|
history
src/src/daemon.c
patch
|
blob
|
history
src/src/exim.c
patch
|
blob
|
history
src/src/exim.h
patch
|
blob
|
history
src/src/smtp_in.c
patch
|
blob
|
history
diff --git
a/doc/doc-txt/ChangeLog
b/doc/doc-txt/ChangeLog
index cdd74fbda9bfa9c85e86d17ab15ff9d1d287e18f..fb88fa9e17aeb5b5944270e3f8f29c6b325b9567 100644
(file)
--- a/
doc/doc-txt/ChangeLog
+++ b/
doc/doc-txt/ChangeLog
@@
-1,4
+1,4
@@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.9
0 2005/03/15 12:27:54
ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.9
1 2005/03/15 14:09:12
ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
Change log file for Exim from version 4.21
-------------------------------------------
@@
-40,6
+40,9
@@
PH/04. Change 4.11/85 fixed an obscure bug concerned with addresses that are
certain circumstances this could lead to multiple deliveries to the same
address. A one-line patch to add the appropriate test fixes the bug.
certain circumstances this could lead to multiple deliveries to the same
address. A one-line patch to add the appropriate test fixes the bug.
+PH/05. Renamed the macro SOCKLEN_T as EXIM_SOCKLEN_T because AIX uses SOCKLEN_T
+ in its include files, and this causes problems building Exim.
+
A note about Exim versions 4.44 and 4.50
----------------------------------------
A note about Exim versions 4.44 and 4.50
----------------------------------------
diff --git
a/src/OS/os.h-OSF1
b/src/OS/os.h-OSF1
index 1aa4ff95d725bd30481e322f73836a0a2eaf39ee..e7561a2856ca6aa2e9f2b6673162d593888687b6 100644
(file)
--- a/
src/OS/os.h-OSF1
+++ b/
src/OS/os.h-OSF1
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/OS/os.h-OSF1,v 1.
1 2004/10/06 15:07:39
ph10 Exp $ */
+/* $Cambridge: exim/src/OS/os.h-OSF1,v 1.
2 2005/03/15 14:09:12
ph10 Exp $ */
/* Exim: OS-specific C header file for OSF1 */
/* Exim: OS-specific C header file for OSF1 */
@@
-8,6
+8,6
@@
typedef struct flock flock_t;
#define F_FREESP O_TRUNC
typedef struct flock flock_t;
#define F_FREESP O_TRUNC
-#define SOCKLEN_T size_t
+#define
EXIM_
SOCKLEN_T size_t
/* End */
/* End */
diff --git
a/src/OS/os.h-SCO
b/src/OS/os.h-SCO
index 1b7eb06e37eecbfc21c9b150fc6e9c4c9550b94d..15b59b070f9c397da6b19deec07c4a5f6055891e 100644
(file)
--- a/
src/OS/os.h-SCO
+++ b/
src/OS/os.h-SCO
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/OS/os.h-SCO,v 1.
1 2004/10/06 15:07:39
ph10 Exp $ */
+/* $Cambridge: exim/src/OS/os.h-SCO,v 1.
2 2005/03/15 14:09:12
ph10 Exp $ */
/* Exim: OS-specific C header file for SCO */
/* Exim: OS-specific C header file for SCO */
@@
-10,7
+10,7
@@
#define LOAD_AVG_SYMBOL "avenrun"
#define KERNEL_PATH "/unix"
#define FSCALE 256
#define LOAD_AVG_SYMBOL "avenrun"
#define KERNEL_PATH "/unix"
#define FSCALE 256
-#define
SOCKLEN_T
int
+#define
EXIM_SOCKLEN_T
int
#define HAVE_SYS_STATVFS_H
#define F_FAVAIL f_favail
#define HAVE_SYS_STATVFS_H
#define F_FAVAIL f_favail
diff --git
a/src/OS/os.h-SCO_SV
b/src/OS/os.h-SCO_SV
index 76dc4020fb31bba79891a370ec3488bb4815494c..7d8e2a8e2cfa03dbae0462266332aa9eb24c153c 100644
(file)
--- a/
src/OS/os.h-SCO_SV
+++ b/
src/OS/os.h-SCO_SV
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/OS/os.h-SCO_SV,v 1.
1 2004/10/06 15:07:39
ph10 Exp $ */
+/* $Cambridge: exim/src/OS/os.h-SCO_SV,v 1.
2 2005/03/15 14:09:12
ph10 Exp $ */
/* Exim: OS-specific C header file for SCO_SV */
/* Exim: OS-specific C header file for SCO_SV */
@@
-8,7
+8,7
@@
#define LOAD_AVG_SYMBOL "avenrun"
#define KERNEL_PATH "/unix"
#define FSCALE 256
#define LOAD_AVG_SYMBOL "avenrun"
#define KERNEL_PATH "/unix"
#define FSCALE 256
-#define
SOCKLEN_T
int
+#define
EXIM_SOCKLEN_T
int
#define HAVE_SYS_STATVFS_H
#define F_FAVAIL f_favail
#define HAVE_SYS_STATVFS_H
#define F_FAVAIL f_favail
diff --git
a/src/OS/os.h-SunOS5
b/src/OS/os.h-SunOS5
index d0ffd57fdb46ce671bd230b9d83930b21464dd49..43c9eb9aef28f2eebddb4b1fe27031c094ce1e57 100644
(file)
--- a/
src/OS/os.h-SunOS5
+++ b/
src/OS/os.h-SunOS5
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/OS/os.h-SunOS5,v 1.
1 2004/10/06 15:07:39
ph10 Exp $ */
+/* $Cambridge: exim/src/OS/os.h-SunOS5,v 1.
2 2005/03/15 14:09:12
ph10 Exp $ */
/* Exim: OS-specific C header file for SunOS5 aka Solaris */
/* Exim: OS-specific C header file for SunOS5 aka Solaris */
@@
-23,7
+23,7
@@
/* This is needed for some early Solaris releases, but causes trouble
in the current ones, so it is out by default. */
/* This is needed for some early Solaris releases, but causes trouble
in the current ones, so it is out by default. */
-/* #define
SOCKLEN_T
size_t */
+/* #define
EXIM_SOCKLEN_T
size_t */
/* This is different from Linux and all other PAM implementations,
it seems. */
/* This is different from Linux and all other PAM implementations,
it seems. */
diff --git
a/src/OS/os.h-Unixware7
b/src/OS/os.h-Unixware7
index 618bac677945e88f0f6b72513101efc3abd296a3..03ca6018f7f93f86ccaf01fa8661439e74fd2073 100644
(file)
--- a/
src/OS/os.h-Unixware7
+++ b/
src/OS/os.h-Unixware7
@@
-1,11
+1,11
@@
-/* $Cambridge: exim/src/OS/os.h-Unixware7,v 1.
1 2004/10/06 15:07:39
ph10 Exp $ */
+/* $Cambridge: exim/src/OS/os.h-Unixware7,v 1.
2 2005/03/15 14:09:12
ph10 Exp $ */
/* Exim: OS-specific C header file for Unixware 7 */
#define NO_SYSEXITS
#define ICONV_ARG2_TYPE char **
/* Exim: OS-specific C header file for Unixware 7 */
#define NO_SYSEXITS
#define ICONV_ARG2_TYPE char **
-#define SOCKLEN_T size_t
+#define
EXIM_
SOCKLEN_T size_t
#define LOAD_AVG_NEEDS_ROOT
#define HAVE_DEV_KMEM
#define LOAD_AVG_NEEDS_ROOT
#define HAVE_DEV_KMEM
diff --git
a/src/src/daemon.c
b/src/src/daemon.c
index 76e970eb346b3ffd80dd57a766b7c0069a726a86..21d11102381921d9c9ecfc367589117894a257fd 100644
(file)
--- a/
src/src/daemon.c
+++ b/
src/src/daemon.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/daemon.c,v 1.
9 2005/02/17 11:58:25
ph10 Exp $ */
+/* $Cambridge: exim/src/src/daemon.c,v 1.
10 2005/03/15 14:09:12
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-142,7
+142,7
@@
handle_smtp_call(int *listen_sockets, int listen_socket_count,
{
pid_t pid;
union sockaddr_46 interface_sockaddr;
{
pid_t pid;
union sockaddr_46 interface_sockaddr;
-SOCKLEN_T ifsize = sizeof(interface_sockaddr);
+
EXIM_
SOCKLEN_T ifsize = sizeof(interface_sockaddr);
int dup_accept_socket = -1;
int max_for_this_host = 0;
int wfsize = 0;
int dup_accept_socket = -1;
int max_for_this_host = 0;
int wfsize = 0;
@@
-1578,7
+1578,7
@@
for (;;)
struct sockaddr_in accepted;
#endif
struct sockaddr_in accepted;
#endif
- SOCKLEN_T len = sizeof(accepted);
+
EXIM_
SOCKLEN_T len = sizeof(accepted);
pid_t pid;
/* This code is placed first in the loop, so that it gets obeyed at the
pid_t pid;
/* This code is placed first in the loop, so that it gets obeyed at the
diff --git
a/src/src/exim.c
b/src/src/exim.c
index 040e385f141ac3ff0170545e03f18e22623eb96d..14cd032280eca7305e12d480b5b27812cac95b68 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/exim.c,v 1.1
5 2005/03/08 15:32:02 tom
Exp $ */
+/* $Cambridge: exim/src/src/exim.c,v 1.1
6 2005/03/15 14:09:12 ph10
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-3450,7
+3450,7
@@
barf. */
if (smtp_input)
{
union sockaddr_46 inetd_sock;
if (smtp_input)
{
union sockaddr_46 inetd_sock;
- SOCKLEN_T size = sizeof(inetd_sock);
+
EXIM_
SOCKLEN_T size = sizeof(inetd_sock);
if (getpeername(0, (struct sockaddr *)(&inetd_sock), &size) == 0)
{
int family = ((struct sockaddr *)(&inetd_sock))->sa_family;
if (getpeername(0, (struct sockaddr *)(&inetd_sock), &size) == 0)
{
int family = ((struct sockaddr *)(&inetd_sock))->sa_family;
diff --git
a/src/src/exim.h
b/src/src/exim.h
index ae22894c2a7839bf218efb71fe47156a8930c233..42f7980c2ec0b23223022d66e7bc04359976f317 100644
(file)
--- a/
src/src/exim.h
+++ b/
src/src/exim.h
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/exim.h,v 1.
8 2005/03/08 15:32:02 tom
Exp $ */
+/* $Cambridge: exim/src/src/exim.h,v 1.
9 2005/03/15 14:09:12 ph10
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-107,11
+107,12
@@
in sys/file.h. */
#include <sysexits.h>
#endif
#include <sysexits.h>
#endif
-/* A few OS don't have socklen_t; their os.h files define SOCKLEN_T to
-be size_t or whatever. */
+/* A few OS don't have socklen_t; their os.h files define EXIM_SOCKLEN_T to
+be size_t or whatever. We used to use SOCKLEN_T, but then it was discovered
+that this is used by the AIX include files. */
-#ifndef SOCKLEN_T
-#define SOCKLEN_T socklen_t
+#ifndef
EXIM_
SOCKLEN_T
+#define
EXIM_
SOCKLEN_T socklen_t
#endif
/* Ensure that the sysexits we reference are defined */
#endif
/* Ensure that the sysexits we reference are defined */
diff --git
a/src/src/smtp_in.c
b/src/src/smtp_in.c
index 98a8d6ddfb4707c2f3a3e298c16d18853efbbf35..7328280be450a4edfa286c81852fb3216c674272 100644
(file)
--- a/
src/src/smtp_in.c
+++ b/
src/src/smtp_in.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/smtp_in.c,v 1.1
2 2005/03/08 15:32:02 tom
Exp $ */
+/* $Cambridge: exim/src/src/smtp_in.c,v 1.1
3 2005/03/15 14:09:12 ph10
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-1262,16
+1262,16
@@
if (!sender_host_unknown)
if (!host_checking && !sender_host_notsocket)
{
#if OPTSTYLE == 1
if (!host_checking && !sender_host_notsocket)
{
#if OPTSTYLE == 1
- SOCKLEN_T optlen = sizeof(struct ip_options) + MAX_IPOPTLEN;
+
EXIM_
SOCKLEN_T optlen = sizeof(struct ip_options) + MAX_IPOPTLEN;
struct ip_options *ipopt = store_get(optlen);
#elif OPTSTYLE == 2
struct ip_opts ipoptblock;
struct ip_opts *ipopt = &ipoptblock;
struct ip_options *ipopt = store_get(optlen);
#elif OPTSTYLE == 2
struct ip_opts ipoptblock;
struct ip_opts *ipopt = &ipoptblock;
- SOCKLEN_T optlen = sizeof(ipoptblock);
+
EXIM_
SOCKLEN_T optlen = sizeof(ipoptblock);
#else
struct ipoption ipoptblock;
struct ipoption *ipopt = &ipoptblock;
#else
struct ipoption ipoptblock;
struct ipoption *ipopt = &ipoptblock;
- SOCKLEN_T optlen = sizeof(ipoptblock);
+
EXIM_
SOCKLEN_T optlen = sizeof(ipoptblock);
#endif
/* Occasional genuine failures of getsockopt() have been seen - for
#endif
/* Occasional genuine failures of getsockopt() have been seen - for