From 2548ba04544aa8a42cdc5c69cd48171898949b54 Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Tue, 2 Aug 2005 09:01:44 +0000 Subject: [PATCH] Set USE_INET_NTOA_FIX for AIX as well as for IRIX (untested). --- doc/doc-txt/ChangeLog | 6 +++++- src/src/buildconfig.c | 7 ++++--- src/src/host.c | 5 ++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 8dfb62269..b39c70a2c 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.189 2005/08/02 08:25:45 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.190 2005/08/02 09:01:44 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -31,6 +31,10 @@ PH/06 The use of forbid_filter_existstest now also locks out the use of the PH/07 Changed "SMTP protocol violation: synchronization error" into "SMTP protocol synchronization error", to keep the pedants happy. +PH/08 Arrange for USE_INET_NTOA_FIX to be set in config.h for AIX systems as + well as for IRIX systems, when gcc is being used. See the host.c source + file for comments. + Exim version 4.52 ----------------- diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c index e7be3eab1..8ccd47bf2 100644 --- a/src/src/buildconfig.c +++ b/src/src/buildconfig.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/buildconfig.c,v 1.10 2005/06/27 14:29:43 ph10 Exp $ */ +/* $Cambridge: exim/src/src/buildconfig.c,v 1.11 2005/08/02 09:01:44 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -285,10 +285,11 @@ fprintf(new, "#define HAVE_ICONV %s\n", if (errno_quota[0] != 0) fprintf(new, "\n#define ERRNO_QUOTA %s\n", errno_quota); -if (strcmp(cc, "gcc") == 0 && strstr(ostype, "IRIX") != NULL) +if (strcmp(cc, "gcc") == 0 && + (strstr(ostype, "IRIX") != NULL || strstr(ostype, "AIX") != NULL)) { fprintf(new, "\n/* This switch includes the code to fix the inet_ntoa() */"); - fprintf(new, "\n/* bug when using gcc on an IRIX system. */"); + fprintf(new, "\n/* bug when using gcc on an IRIX or AIX system. */"); fprintf(new, "\n#define USE_INET_NTOA_FIX"); } diff --git a/src/src/host.c b/src/src/host.c index 32e24e280..d8f560788 100644 --- a/src/src/host.c +++ b/src/src/host.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/host.c,v 1.10 2005/06/22 15:44:38 ph10 Exp $ */ +/* $Cambridge: exim/src/src/host.c,v 1.11 2005/08/02 09:01:44 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -40,6 +40,9 @@ with these comments: code by Stuart Levy as seen in comp.sys.sgi.admin +August 2005: Apparently this is also needed for AIX systems; USE_INET_NTOA_FIX +should now be set for them as well. + Arguments: sa an in_addr structure Returns: pointer to static text string */ -- 2.30.2