openssh: Update to 5.9p1.

[people/ms/ipfire-3.x.git] / openssh / patches / openssh-5.9p1-edns.patch

diff --git a/openssh/patches/openssh-5.2p1-edns.patch b/openssh/patches/openssh-5.9p1-edns.patch
similarity index 62%
rename from openssh/patches/openssh-5.2p1-edns.patch
rename to openssh/patches/openssh-5.9p1-edns.patch
index f3e431eeba1832c3a3237843b4e1e8e74831d3e8..34f3851269797f6d034cebc714156e96b9922e3e 100644 (file)
--- a/openssh/patches/openssh-5.2p1-edns.patch
+++ b/openssh/patches/openssh-5.9p1-edns.patch
@@ -1,7 +1,7 @@
-diff -up openssh-5.2p1/dns.c.rh205842 openssh-5.2p1/dns.c
---- openssh-5.2p1/dns.c.rh205842       2009-07-27 16:25:28.000000000 +0200
-+++ openssh-5.2p1/dns.c        2009-07-27 16:40:59.000000000 +0200
-@@ -176,6 +176,7 @@ verify_host_key_dns(const char *hostname
+diff -up openssh-5.9p1/dns.c.edns openssh-5.9p1/dns.c
+--- openssh-5.9p1/dns.c.edns   2010-08-31 14:41:14.000000000 +0200
++++ openssh-5.9p1/dns.c        2011-09-09 08:05:27.782440497 +0200
+@@ -177,6 +177,7 @@ verify_host_key_dns(const char *hostname
  {
        u_int counter;
        int result;
@@ -9,7 +9,7 @@ diff -up openssh-5.2p1/dns.c.rh205842 openssh-5.2p1/dns.c
        struct rrsetinfo *fingerprints = NULL;
  
        u_int8_t hostkey_algorithm;
-@@ -199,8 +200,19 @@ verify_host_key_dns(const char *hostname
+@@ -200,8 +201,19 @@ verify_host_key_dns(const char *hostname
                return -1;
        }
  
@@ -30,9 +30,9 @@ diff -up openssh-5.2p1/dns.c.rh205842 openssh-5.2p1/dns.c
        if (result) {
                verbose("DNS lookup error: %s", dns_result_totext(result));
                return -1;
-diff -up openssh-5.2p1/openbsd-compat/getrrsetbyname.c.rh205842 openssh-5.2p1/openbsd-compat/getrrsetbyname.c
---- openssh-5.2p1/openbsd-compat/getrrsetbyname.c.rh205842     2009-07-27 16:22:23.000000000 +0200
-+++ openssh-5.2p1/openbsd-compat/getrrsetbyname.c      2009-07-27 16:41:55.000000000 +0200
+diff -up openssh-5.9p1/openbsd-compat/getrrsetbyname.c.edns openssh-5.9p1/openbsd-compat/getrrsetbyname.c
+--- openssh-5.9p1/openbsd-compat/getrrsetbyname.c.edns 2009-07-13 03:38:23.000000000 +0200
++++ openssh-5.9p1/openbsd-compat/getrrsetbyname.c      2011-09-09 15:03:39.930500801 +0200
 @@ -209,8 +209,8 @@ getrrsetbyname(const char *hostname, uns
                goto fail;
        }
@@ -40,7 +40,7 @@ diff -up openssh-5.2p1/openbsd-compat/getrrsetbyname.c.rh205842 openssh-5.2p1/op
 -      /* don't allow flags yet, unimplemented */
 -      if (flags) {
 +      /* Allow RRSET_FORCE_EDNS0 flag only. */
-+      if ((flags & !RRSET_FORCE_EDNS0) != 0) {
++      if ((flags & ~RRSET_FORCE_EDNS0) != 0) {
                result = ERRSET_INVAL;
                goto fail;
        }
@@ -57,9 +57,9 @@ diff -up openssh-5.2p1/openbsd-compat/getrrsetbyname.c.rh205842 openssh-5.2p1/op
  #endif /* RES_USE_DNSEC */
  
        /* make query */
-diff -up openssh-5.2p1/openbsd-compat/getrrsetbyname.h.rh205842 openssh-5.2p1/openbsd-compat/getrrsetbyname.h
---- openssh-5.2p1/openbsd-compat/getrrsetbyname.h.rh205842     2009-07-27 16:35:02.000000000 +0200
-+++ openssh-5.2p1/openbsd-compat/getrrsetbyname.h      2009-07-27 16:36:09.000000000 +0200
+diff -up openssh-5.9p1/openbsd-compat/getrrsetbyname.h.edns openssh-5.9p1/openbsd-compat/getrrsetbyname.h
+--- openssh-5.9p1/openbsd-compat/getrrsetbyname.h.edns 2007-10-26 08:26:50.000000000 +0200
++++ openssh-5.9p1/openbsd-compat/getrrsetbyname.h      2011-09-09 08:05:27.965438689 +0200
 @@ -72,6 +72,9 @@
  #ifndef RRSET_VALIDATED
  # define RRSET_VALIDATED      1