Ticket History #955: net/if_arp.h not safe for multiple inclusions on OpenBSD

From kwc@citi.umich.edu Tue May 15 12:19:25 2001
Received: from pacific-carrier-annex.mit.edu (PACIFIC-CARRIER-ANNEX.MIT.EDU [18.7.21.83])
by rt-11.mit.edu (8.9.3/8.9.3) with ESMTP id MAA08330
for <bugs@RT-11.mit.edu>; Tue, 15 May 2001 12:19:21 -0400 (EDT)
Received: from citi.umich.edu (citi.umich.edu [141.211.92.141])
by pacific-carrier-annex.mit.edu (8.9.2/8.9.2) with ESMTP id MAA29757
for <krb5-bugs@mit.edu>; Tue, 15 May 2001 12:19:20 -0400 (EDT)
Received: from citi.umich.edu (buffalo.citi.umich.edu [141.211.92.191])
by citi.umich.edu (Postfix) with ESMTP
id 42954207C1; Tue, 15 May 2001 12:19:20 -0400 (EDT)
Message-Id: <20010515161920.42954207C1@citi.umich.edu>
Date: Tue, 15 May 2001 12:19:20 -0400
From: Kevin Coffman <kwc@citi.umich.edu>
To: "Russell P. Sutherland" <russ@madhaus.cns.utoronto.ca>
Cc: krb5-bugs@mit.edu, Kevin Coffman <kwc@citi.umich.edu>
In-Reply-To: Your message of "Tue, 15 May 2001 10:50:48 EDT."
<20010515105048.A24199@madhaus.cns.utoronto.ca>
Subject:

The real cause of this, is that OpenBSD does not protect against
including <net/if.h> more than once. Here is my workaround...


RCS file:krb5/src/kdc/network.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -c -r1.1.1.1 -r1.2
*** kdc/network.c 2000/07/06 19:36:17 1.1.1.1
--- kdc/network.c 2000/10/16 15:52:52 1.2
***************
*** 51,57 ****
--- 51,64 ----
#endif
#include <arpa/inet.h>

+ #if !defined(ARPHRD_ETHER) /* UMICH */
+ /*
+ * OpenBSD doesn't have a #define to prevent net/if.h from
+ * being included multiple times. We don't want to include
+ * it again if ARPHRD_ETHER is defined.
+ */
#include <net/if.h>
+ #endif /* UMICH */

extern int errno;






Responsible-Changed-From-To: gnats-admin->raeburn
Responsible-Changed-By: raeburn
Responsible-Changed-When: Sat Jun 23 00:56:17 2001
Responsible-Changed-Why:
I'll take it...

From russ@madhaus.cns.utoronto.ca Tue May 15 10:50:50 2001
Received: from pacific-carrier-annex.mit.edu (PACIFIC-CARRIER-ANNEX.MIT.EDU [18.7.21.83])
by rt-11.mit.edu (8.9.3/8.9.3) with ESMTP id KAA08135
for <bugs@RT-11.mit.edu>; Tue, 15 May 2001 10:50:49 -0400 (EDT)
Received: from madhaus.cns.utoronto.ca (madhaus.cns.utoronto.ca [128.100.103.10])
by pacific-carrier-annex.mit.edu (8.9.2/8.9.2) with SMTP id KAA22838
for <krb5-bugs@mit.edu>; Tue, 15 May 2001 10:50:49 -0400 (EDT)
Received: (qmail 24286 invoked by uid 1032); 15 May 2001 14:50:48 -0000
Message-Id: <20010515105048.A24199@madhaus.cns.utoronto.ca>
Date: Tue, 15 May 2001 10:50:48 -0400
From: "Russell P. Sutherland" <russ@madhaus.cns.utoronto.ca>
To: krb5-bugs@mit.edu
Subject: compile/build error

I'm having difficulty compiling krb5-1.2.2 on an OpenBSD sparc box:

kdc# dmesg
OpenBSD 2.9-current (GENERIC) #37: Sat May 12 15:11:42 MDT 2001
deraadt@sun4m.openbsd.org:/usr/src/sys/arch/sparc/compile/GENERIC
real mem = 83574784
avail mem = 74604544
using 200 buffers containing 4177920 bytes of memory
bootpath:
/iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000/sd@3,0
mainbus0 (root): SUNW,SPARCstation-5
cpu0 at mainbus0: MB86904 @ 70 MHz, on-chip FPU
cpu0: 16K instruction (32 b/l), 8K data (16 b/l) cache enabled
obio0 at mainbus0
clock0 at obio0 addr 0x71200000: mk48t08 (eeprom)
timer0 at obio0 addr 0x71d00000 delay constant 33
zs0 at obio0 addr 0x71100000 pri 12, softpri 6
zs0a: console i/o
zs1 at obio0 addr 0x71000000 pri 12, softpri 6
slavioconfig at obio0 addr 0x71800000 not configured
auxreg0 at obio0 addr 0x71900000
power0 at obio0 addr 0x71910000
fdc0 at obio0 addr 0x71400000 pri 11, softpri 4: chip 82077
iommu0 at mainbus0 addr 0x10000000: version 0x4/0x0, page-size 4096,
range 64MB
sbus0 at iommu0: clock = 23.333 MHz
dma0 at sbus0 slot 5 offset 0x8400000: rev 2
esp0 at dma0 offset 0x8800000 pri 4: ESP200, 40MHz, SCSI ID 7
scsibus0 at esp0: 8 targets
sd0 at scsibus0 targ 3 lun 0: <CONNER, CP30548 SUN0535, B0CD> SCSI2
0/direct fixed
sd0: 517MB, 2242 cyl, 6 head, 78 sec, 512 bytes/sec, 1059528 sec
total
bpp0 at sbus0 slot 5 offset 0xc800000: DMA2
ledma0 at sbus0 slot 5 offset 0x8400010: rev 2
le0 at ledma0 offset 0x8c00000 pri 6: address 08:00:20:23:7c:98
le0: 16 receive buffers, 4 transmit buffers
cgthree0 at sbus0 slot 3 offset 0x0: SUNW,501-2691, 1024 x 768
power-management at sbus0 slot 4 offset 0xa000000 not configured
audiocs0 at sbus0 slot 4 offset 0xc000000 pri 9, softpri 4
audio0 at audiocs0
afx-misc at sbus0 slot 4 offset 0xe000000 not configured
root on sd0a
rootdev=0x700 rrootdev=0x1100 rawdev=0x1102

kdc# pwd
/usr/local/src/krb5-1.2.2/src
kdc# make

...

making all in lib/kadm5/unit-test...
making all in krb524...
making all in kdc...
cc -DKRB5_DNS_LOOKUP_KDC=1 -DKRB5_DNS_LOOKUP=1 -DPOSIX_TERMIOS=1
-DHAVE_SYSLOG_H=1 -DHAVE_STDARG_H=1 -
DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1 -DHAVE_OPENLOG=1
-DHAVE_SYSLOG=1 -DHAVE_CLOSELOG=1 -DHAVE_S
TRFTIME=1 -DHAVE_VSPRINTF=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_SOCKET_H=1
-DHAVE_NETINET_IN_H=1 -DHAVE_IN
ET_NTOP=1 -DHAVE_INET_PTON=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETNAMEINFO=1
-DKRB5_USE_INET6=1 -DHAVE_SA_LE
N=1 -DPOSIX_SIGNALS=1 -DUSE_RCACHE=1 -DKRB5_KRB4_COMPAT -I../include
-I./../include -I../include/krb5
-I./../include/krb5 -I./../include/kerberosIV -I../include/kerberosIV
-I. -c network.c
In file included from network.c:54:
/usr/include/net/if.h:80: redefinition of `struct if_data'
/usr/include/net/if.h:116: redefinition of `struct ifnet_head'
/usr/include/net/if.h:125: redefinition of `struct ifnet'
/usr/include/net/if.h:149: redefinition of `struct ifqueue'
/usr/include/net/if.h:251: redefinition of `struct ifaddr'
/usr/include/net/if.h:272: redefinition of `struct ifprefix'
/usr/include/net/if.h:284: redefinition of `struct if_msghdr'
/usr/include/net/if.h:298: redefinition of `struct ifa_msghdr'
/usr/include/net/if.h:314: redefinition of `struct ifreq'
/usr/include/net/if.h:334: redefinition of `struct ifaliasreq'
/usr/include/net/if.h:342: redefinition of `struct ifmediareq'
/usr/include/net/if.h:359: redefinition of `struct ifconf'
/usr/include/net/if.h:372: redefinition of `struct if_laddrreq'
/usr/include/net/if.h:381: redefinition of `struct if_nameindex'
In file included from /usr/include/net/if.h:395,
from network.c:54:
/usr/include/net/if_arp.h:49: redefinition of `struct arphdr'
/usr/include/net/if_arp.h:79: redefinition of `struct arpreq'
*** Error code 1
Stop in /usr/local/src/krb5-1.2.2/src/kdc.
*** Error code 1
Stop in /usr/local/src/krb5-1.2.2/src (line 936 of Makefile).

--
Russell P. Sutherland Email: russ@madhaus.cns.utoronto.ca
4 Bancroft Ave., Rm. 102 Voice: +1.416.978.0470
University of Toronto Fax: +1.416.978.6620
Toronto, ON M5S 1C1 WWW: http://madhaus.cns.utoronto.ca/~russ
CANADA

Responsible-Changed-From-To: gnats-admin->raeburn
Responsible-Changed-By: raeburn
Responsible-Changed-When: Sat Jun 23 00:56:37 2001
Responsible-Changed-Why:
I'll take it...