ph10 2005/03/15 14:09:12 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/OS os.h-OSF1 os.h-SCO os.h-SCO_SV
os.h-SunOS5 os.h-Unixware7
exim-src/src daemon.c exim.c exim.h smtp_in.c
Log:
Renamed SOCKLEN_T as EXIM_SOCKLEN_T to avoid a problem in AIX.
Revision Changes Path
1.91 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.2 +1 -1 exim/exim-src/OS/os.h-OSF1
1.2 +1 -1 exim/exim-src/OS/os.h-SCO
1.2 +1 -1 exim/exim-src/OS/os.h-SCO_SV
1.2 +1 -1 exim/exim-src/OS/os.h-SunOS5
1.2 +1 -1 exim/exim-src/OS/os.h-Unixware7
1.10 +2 -2 exim/exim-src/src/daemon.c
1.16 +1 -1 exim/exim-src/src/exim.c
1.9 +5 -4 exim/exim-src/src/exim.h
1.13 +3 -3 exim/exim-src/src/smtp_in.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- ChangeLog 15 Mar 2005 12:27:54 -0000 1.90
+++ ChangeLog 15 Mar 2005 14:09:12 -0000 1.91
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.90 2005/03/15 12:27:54 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.91 2005/03/15 14:09:12 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -39,6 +39,9 @@
address could be batched with a previous (undelivered) one; under
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
Index: os.h-OSF1
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.h-OSF1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os.h-OSF1 6 Oct 2004 15:07:39 -0000 1.1
+++ os.h-OSF1 15 Mar 2005 14:09:12 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/OS/os.h-OSF1,v 1.1 2004/10/06 15:07:39 ph10 Exp $ */
+/* $Cambridge: exim/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 */
@@ -8,6 +8,6 @@
typedef struct flock flock_t;
#define F_FREESP O_TRUNC
-#define SOCKLEN_T size_t
+#define EXIM_SOCKLEN_T size_t
/* End */
Index: os.h-SCO
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.h-SCO,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os.h-SCO 6 Oct 2004 15:07:39 -0000 1.1
+++ os.h-SCO 15 Mar 2005 14:09:12 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/OS/os.h-SCO,v 1.1 2004/10/06 15:07:39 ph10 Exp $ */
+/* $Cambridge: exim/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 */
@@ -10,7 +10,7 @@
#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
Index: os.h-SCO_SV
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.h-SCO_SV,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os.h-SCO_SV 6 Oct 2004 15:07:39 -0000 1.1
+++ os.h-SCO_SV 15 Mar 2005 14:09:12 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/OS/os.h-SCO_SV,v 1.1 2004/10/06 15:07:39 ph10 Exp $ */
+/* $Cambridge: exim/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 */
@@ -8,7 +8,7 @@
#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
Index: os.h-SunOS5
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.h-SunOS5,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os.h-SunOS5 6 Oct 2004 15:07:39 -0000 1.1
+++ os.h-SunOS5 15 Mar 2005 14:09:12 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/OS/os.h-SunOS5,v 1.1 2004/10/06 15:07:39 ph10 Exp $ */
+/* $Cambridge: exim/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 */
@@ -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. */
-/* #define SOCKLEN_T size_t */
+/* #define EXIM_SOCKLEN_T size_t */
/* This is different from Linux and all other PAM implementations,
it seems. */
Index: os.h-Unixware7
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.h-Unixware7,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os.h-Unixware7 6 Oct 2004 15:07:39 -0000 1.1
+++ os.h-Unixware7 15 Mar 2005 14:09:12 -0000 1.2
@@ -1,11 +1,11 @@
-/* $Cambridge: exim/exim-src/OS/os.h-Unixware7,v 1.1 2004/10/06 15:07:39 ph10 Exp $ */
+/* $Cambridge: exim/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 **
-#define SOCKLEN_T size_t
+#define EXIM_SOCKLEN_T size_t
#define LOAD_AVG_NEEDS_ROOT
#define HAVE_DEV_KMEM
Index: daemon.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/daemon.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- daemon.c 17 Feb 2005 11:58:25 -0000 1.9
+++ daemon.c 15 Mar 2005 14:09:12 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/daemon.c,v 1.9 2005/02/17 11:58:25 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/daemon.c,v 1.10 2005/03/15 14:09:12 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -142,7 +142,7 @@
{
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;
@@ -1578,7 +1578,7 @@
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
Index: exim.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exim.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- exim.c 8 Mar 2005 15:32:02 -0000 1.15
+++ exim.c 15 Mar 2005 14:09:12 -0000 1.16
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/exim.c,v 1.15 2005/03/08 15:32:02 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/exim.c,v 1.16 2005/03/15 14:09:12 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -3450,7 +3450,7 @@
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;
Index: exim.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exim.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- exim.h 8 Mar 2005 15:32:02 -0000 1.8
+++ exim.h 15 Mar 2005 14:09:12 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/exim.h,v 1.8 2005/03/08 15:32:02 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/exim.h,v 1.9 2005/03/15 14:09:12 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -107,11 +107,12 @@
#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 */
Index: smtp_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/smtp_in.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- smtp_in.c 8 Mar 2005 15:32:02 -0000 1.12
+++ smtp_in.c 15 Mar 2005 14:09:12 -0000 1.13
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.12 2005/03/08 15:32:02 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.13 2005/03/15 14:09:12 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1262,16 +1262,16 @@
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;
- SOCKLEN_T optlen = sizeof(ipoptblock);
+ EXIM_SOCKLEN_T optlen = sizeof(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
