diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2010-04-26 03:48:43 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2010-04-26 03:48:43 +0000 |
| commit | 1a0ed7c73eff5d7b085648d8e413ef837a6de451 (patch) | |
| tree | 0a745f7a94e3533610d57f4cf6976f366763d59d /security/krb5/files/patch-lib-krb5-os-localaddr.c | |
| parent | This forced commit documents the repocopy of the now defunct krb5-17 port (diff) | |
Welcome the new krb5-1.8.1. Significant changes include the removal of
the MIT KRB5 applications (now in a separate tarball and port).
Notes
Notes:
svn path=/head/; revision=253264
Diffstat (limited to '')
| -rw-r--r-- | security/krb5/files/patch-lib-krb5-os-localaddr.c | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/security/krb5/files/patch-lib-krb5-os-localaddr.c b/security/krb5/files/patch-lib-krb5-os-localaddr.c index d8956daea367..06b6043f22c9 100644 --- a/security/krb5/files/patch-lib-krb5-os-localaddr.c +++ b/security/krb5/files/patch-lib-krb5-os-localaddr.c @@ -1,6 +1,6 @@ ---- lib/krb5/os/localaddr.c.orig 2009-02-18 10:14:48.000000000 -0800 -+++ lib/krb5/os/localaddr.c 2009-08-28 13:37:41.000000000 -0700 -@@ -173,6 +173,7 @@ +--- lib/krb5/os/localaddr.c.orig 2009-10-30 20:17:27.000000000 -0700 ++++ lib/krb5/os/localaddr.c 2010-04-19 12:39:56.707090973 -0700 +@@ -175,6 +175,7 @@ } #endif @@ -8,68 +8,68 @@ static int is_loopback_address(struct sockaddr *sa) { -@@ -189,6 +190,7 @@ - return 0; +@@ -191,6 +192,7 @@ + return 0; } } +#endif #ifdef HAVE_IFADDRS_H #include <ifaddrs.h> -@@ -464,12 +466,14 @@ - ifp->ifa_flags &= ~IFF_UP; - continue; - } +@@ -467,12 +469,14 @@ + ifp->ifa_flags &= ~IFF_UP; + continue; + } +#if 0 - if (is_loopback_address(ifp->ifa_addr)) { - /* Pretend it's not up, so the second pass will skip - it. */ - ifp->ifa_flags &= ~IFF_UP; - continue; - } + if (is_loopback_address(ifp->ifa_addr)) { + /* Pretend it's not up, so the second pass will skip + it. */ + ifp->ifa_flags &= ~IFF_UP; + continue; + } +#endif - /* If this address is a duplicate, punt. */ - match = 0; - for (ifp2 = ifp_head; ifp2 && ifp2 != ifp; ifp2 = ifp2->ifa_next) { -@@ -598,11 +602,13 @@ - } - /*@=moduncon@*/ + /* If this address is a duplicate, punt. */ + match = 0; + for (ifp2 = ifp_head; ifp2 && ifp2 != ifp; ifp2 = ifp2->ifa_next) { +@@ -601,11 +605,13 @@ + } + /*@=moduncon@*/ +#if 0 - /* None of the current callers want loopback addresses. */ - if (is_loopback_address((struct sockaddr *)&lifr->lifr_addr)) { - Tprintf ((" loopback\n")); - goto skip; - } + /* None of the current callers want loopback addresses. */ + if (is_loopback_address((struct sockaddr *)&lifr->lifr_addr)) { + Tprintf ((" loopback\n")); + goto skip; + } +#endif - /* Ignore interfaces that are down. */ - if ((lifreq.lifr_flags & IFF_UP) == 0) { - Tprintf ((" down\n")); -@@ -769,11 +775,13 @@ - } - /*@=moduncon@*/ + /* Ignore interfaces that are down. */ + if ((lifreq.lifr_flags & IFF_UP) == 0) { + Tprintf ((" down\n")); +@@ -772,11 +778,13 @@ + } + /*@=moduncon@*/ +#if 0 - /* None of the current callers want loopback addresses. */ - if (is_loopback_address(&lifr->iflr_addr)) { - Tprintf ((" loopback\n")); - goto skip; - } + /* None of the current callers want loopback addresses. */ + if (is_loopback_address(&lifr->iflr_addr)) { + Tprintf ((" loopback\n")); + goto skip; + } +#endif - /* Ignore interfaces that are down. */ - if ((lifreq.iflr_flags & IFF_UP) == 0) { - Tprintf ((" down\n")); -@@ -984,11 +992,13 @@ - } - /*@=moduncon@*/ + /* Ignore interfaces that are down. */ + if ((lifreq.iflr_flags & IFF_UP) == 0) { + Tprintf ((" down\n")); +@@ -987,11 +995,13 @@ + } + /*@=moduncon@*/ +#if 0 - /* None of the current callers want loopback addresses. */ - if (is_loopback_address(&ifreq.ifr_addr)) { - Tprintf ((" loopback\n")); - goto skip; - } + /* None of the current callers want loopback addresses. */ + if (is_loopback_address(&ifreq.ifr_addr)) { + Tprintf ((" loopback\n")); + goto skip; + } +#endif - /* Ignore interfaces that are down. */ - if ((ifreq.ifr_flags & IFF_UP) == 0) { - Tprintf ((" down\n")); + /* Ignore interfaces that are down. */ + if ((ifreq.ifr_flags & IFF_UP) == 0) { + Tprintf ((" down\n")); |