rpms/krb5
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- remove a patch to fix problems with interfaces which are "up" but which

Browse Source 
have no address assigned which conflicted with a change to fix the same
    problem in 1.5 (#200979)
This commit is contained in:
Nalin Dahyabhai 2008-02-25 19:58:51 +00:00
parent 2cc4303bbc
commit d73fcc15fb
2 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
krb5-1.4-null.patch
View File

@ -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)

7
krb5.spec
View File

@ -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
@ -227,6 +226,11 @@ to obtain initial credentials from a KDC using a private key and a
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