Ticket History #1711: fake_addrinfo.h doesn't build on libc5 linux

From hgm@lanl.gov Tue Aug 5 12:20:26 2003
Received: from pacific-carrier-annex.mit.edu (PACIFIC-CARRIER-ANNEX.MIT.EDU [18.7.21.83]) by krbdev.mit.edu (8.9.3) with ESMTP
id MAA04843; Tue, 5 Aug 2003 12:20:26 -0400 (EDT)
From: hgm@lanl.gov
Received: from mailrelay3.lanl.gov (mailrelay3.lanl.gov [128.165.4.104])
by pacific-carrier-annex.mit.edu (8.12.4/8.9.2) with ESMTP id h75GKOWv024528
for <krb5-bugs@mit.edu>; Tue, 5 Aug 2003 12:20:24 -0400 (EDT)
Received: from moki.lanl.gov (localhost.localdomain [127.0.0.1])
by mailrelay3.lanl.gov (8.12.9/8.12.9/(ccn-5)) with ESMTP id h75GKNGr030958
for <krb5-bugs@mit.edu>; Tue, 5 Aug 2003 10:20:23 -0600
Received: (from hgm@localhost)
by moki.lanl.gov (8.9.3p2/8.9.3) id KAA28014;
Tue, 5 Aug 2003 10:20:21 -0600
Date: Tue, 5 Aug 2003 10:20:21 -0600
Message-Id: <200308051620.KAA28014@moki.lanl.gov>
To: krb5-bugs@mit.edu
Subject: ./krb5-1.3.1/src/include/fake-addrinfo.h problem
Reply-To: hgm@lanl.gov
Cc:
X-send-pr-version: 3.99
X-Scanned-By: MIMEDefang 2.35




Harry

Internet e-mail: hgm@lanl.gov (Harry G. McGavran, Jr.)
Los Alamos National Laboratory, Los Alamos, New Mexico 87545
Phone: 505/667-4050

System: Linux moki 2.2.25 #3 Mon Apr 14 12:11:16 MDT 2003 i686 unknown
Architecture: i686

In fake_addrinfo.h, WRAP_GETADDRINFO gets defined on linux platforms
even if HAVE_GETADDRINFO is NOT defined and on linux platforms that do NOT
have GETADDRINFO, the build and the code that was meant to wrap GETADDRINFO
fails....

Build on a systems WITHOUT GETADDRINFO on it, like libc5 ---

One can apply the following patch. The change is probably better
made to the "if defined (__linux__) || defined (_AIX)" line,
but I just added an "#if #endif clause" instead -- less elegant, but
my changes are just extra lines then.

*** ./krb5-1.3/src/include/fake-addrinfo.h.orig Wed Apr 9 16:37:49 2003
--- ./krb5-1.3/src/include/fake-addrinfo.h Tue Aug 5 10:05:04 2003
***************
*** 116,123 ****
--- 116,125 ----

#if defined (__linux__) || defined (_AIX)
/* See comments below. */
+ #if defined (HAVE_GETADDRINFO)
# define WRAP_GETADDRINFO
/* # define WRAP_GETNAMEINFO */
+ #endif
#endif

#ifdef __linux__

While libc5 isn't one of our supported configurations, this is a simple enough
change. It should be in the 1.4 release. (Next 1.3.x release? I don't know.)

* fake-addrinfo.h (WRAP_GETADDRINFO, COPY_FIRST_CANONNAME): Don't define on
Linux unless HAVE_GETADDRINFO is defined, for libc5 compatibility.


To generate a diff of this commit:



cvs diff -r1.389 -r1.390 krb5/src/include/ChangeLog
cvs diff -r1.42 -r1.43 krb5/src/include/fake-addrinfo.h