]>
Commit | Line | Data |
---|---|---|
3d4da526 JB |
1 | --- postfix-2.1.5/src/util/inet_addr_local.c.orig 2005-03-01 14:36:17.000000000 +0100 |
2 | +++ postfix-2.1.5/src/util/inet_addr_local.c 2005-03-01 15:04:06.000000000 +0100 | |
3 | @@ -565,10 +565,10 @@ | |
4 | if (addr_family == AF_INET6 || addr_family == AF_UNSPEC) { | |
5 | count = addr_list->used; | |
6 | #ifdef INET6 | |
7 | -#if defined(HAS_PROCNET_IFINET6) | |
8 | - ial_procnet_ifinet6(addr_list, mask_list); | |
9 | -#elif defined(HAVE_GETIFADDRS) | |
10 | +#if defined(HAVE_GETIFADDRS) | |
11 | ial_getifaddrs(addr_list, mask_list, AF_INET6); | |
12 | +#elif defined(HAS_PROCNET_IFINET6) | |
13 | + ial_procnet_ifinet6(addr_list, mask_list); | |
14 | #else | |
15 | ial_generic(addr_list, mask_list, AF_INET6); | |
16 | #endif | |
17 | --- postfix-2.1.5/makedefs.orig 2005-03-01 14:36:17.000000000 +0100 | |
18 | +++ postfix-2.1.5/makedefs 2005-03-01 15:05:38.000000000 +0100 | |
19 | @@ -316,18 +316,6 @@ | |
20 | # Check for IPv6 support | |
21 | ||
22 | if [ -z "$NO_IPV6" ] ; then | |
23 | -if [ -f /usr/include/netinet6/in6.h ] ; then | |
24 | - grep __KAME__ /usr/include/netinet6/in6.h 2>&1 >/dev/null | |
25 | - if [ $? = 1 ]; then | |
26 | - INET6= | |
27 | - else | |
28 | - if [ -f /usr/local/v6/lib/libinet6.a ]; then | |
29 | - INET6=kame | |
30 | - else | |
31 | - INET6=kame-merged | |
32 | - fi | |
33 | - fi | |
34 | -fi | |
35 | if [ -z "$INET6" -a -f /usr/include/netinet/ip6.h ]; then | |
36 | case "$SYSTYPE" in | |
37 | SUNOS5) INET6=solaris ;; | |
38 | @@ -376,11 +364,6 @@ | |
39 | ;; | |
40 | linux) | |
41 | CCARGS="$CCARGS -DINET6 -D__ss_family=ss_family" | |
42 | - if test -f /usr/include/libinet6/netinet/ip6.h -a \ | |
43 | - -f /usr/lib/libinet6.a; then | |
44 | - CCARGS="$CCARGS -I/usr/include/libinet6 -DUSAGI_LIBINET6" | |
45 | - SYSLIBS="$SYSLIBS -linet6" | |
46 | - fi | |
47 | ;; | |
48 | esac | |
49 |