diff options
| author | Nalin Dahyabhai <nalin@fedoraproject.org> | 2008-02-25 19:58:51 +0000 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@fedoraproject.org> | 2008-02-25 19:58:51 +0000 |
| commit | d73fcc15fb311af57d2118e52ed828960fd9dffa (patch) | |
| tree | 9a17b69f22a852a832801db74d57af36f62f03ab | |
| parent | 2cc4303bbc9d322fa1e448dcd0a7ee724ba87604 (diff) | |
| download | krb5-d73fcc15fb311af57d2118e52ed828960fd9dffa.tar.gz krb5-d73fcc15fb311af57d2118e52ed828960fd9dffa.tar.xz krb5-d73fcc15fb311af57d2118e52ed828960fd9dffa.zip | |
- remove a patch to fix problems with interfaces which are "up" but which
have no address assigned which conflicted with a change to fix the same
problem in 1.5 (#200979)
| -rw-r--r-- | krb5-1.4-null.patch | 33 | ||||
| -rw-r--r-- | krb5.spec | 7 |
2 files changed, 5 insertions, 35 deletions
diff --git a/krb5-1.4-null.patch b/krb5-1.4-null.patch deleted file mode 100644 index d1e6833..0000000 --- a/krb5-1.4-null.patch +++ /dev/null @@ -1,33 +0,0 @@ -Screen out interfaces which have no address in foreach_localaddr(). (Per man -pages for OpenBSD and OS/X, they are legal.) If it doesn't have an address, -the functions which call this function (src/kdc/network.c, which wants to -listen on the interfaces, and src/lib/krb5/os/localaddr.c, which just wants a -list of local addresses), have no use for it anyway. - -This is slightly different than the fix proposed by Paul Jakma at -http://mailman.mit.edu/pipermail/krb5-bugs/2004-January/002152.html, but is -more or less equivalent. - -Don't worry, printifaddr() already checks that ifp->ifa_addr != NULL before -printing it. - ---- krb5-1.4/src/lib/krb5/os/localaddr.c 2005-02-18 11:20:52.000000000 -0500 -+++ krb5-1.4/src/lib/krb5/os/localaddr.c 2005-02-18 11:23:52.000000000 -0500 -@@ -435,6 +435,8 @@ - #ifdef DEBUG - printifaddr (ifp); - #endif -+ if (ifp->ifa_addr == NULL) -+ continue; - if ((ifp->ifa_flags & IFF_UP) == 0) - continue; - if (ifp->ifa_flags & IFF_LOOPBACK) { -@@ -458,6 +460,8 @@ - /* If this address is a duplicate, punt. */ - match = 0; - for (ifp2 = ifp_head; ifp2 && ifp2 != ifp; ifp2 = ifp2->ifa_next) { -+ if (ifp2->ifa_addr == NULL) -+ continue; - if ((ifp2->ifa_flags & IFF_UP) == 0) - continue; - if (ifp2->ifa_flags & IFF_LOOPBACK) @@ -63,7 +63,6 @@ Patch14: krb5-1.3-ftp-glob.patch Patch16: krb5-1.6-buildconf.patch Patch18: krb5-1.2.7-reject-bad-transited.patch Patch23: krb5-1.3.1-dns.patch -Patch25: krb5-1.4-null.patch Patch26: krb5-1.3.2-efence.patch Patch27: krb5-1.3.3-rcp-sendlarge.patch Patch29: krb5-1.3.5-kprop-mktemp.patch @@ -228,6 +227,11 @@ certificate. %changelog * Mon Feb 25 2008 Nalin Dahyabhai <nalin@redhat.com> +- remove a patch, to fix problems with interfaces which are "up" but which + have no address assigned, which conflicted with a different fix for the same + problem in 1.5 (#200979) + +* Mon Feb 25 2008 Nalin Dahyabhai <nalin@redhat.com> - ftp: don't lose track of a descriptor on passive get when the server fails to open a file @@ -1283,7 +1287,6 @@ popd %patch16 -p1 -b .buildconf %patch18 -p1 -b .reject-bad-transited %patch23 -p1 -b .dns -%patch25 -p1 -b .null # Removes a malloc(0) case, nothing more. # %patch26 -p1 -b .efence %patch27 -p1 -b .rcp-sendlarge |