* New upstream release (http://www.openssh.com/txt/release-6.1).

  - Enable pre-auth sandboxing by default for new installs.
  - Allow "PermitOpen none" to refuse all port-forwarding requests
    (closes: #543683).

3 files changed, 9 insertions, 3 deletions

diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h
index d223792d7..b4bcd04b7 100644
--- a/openbsd-compat/bsd-cygwin_util.h
+++ b/openbsd-compat/bsd-cygwin_util.h
@@ -1,4 +1,4 @@
-/* $Id: bsd-cygwin_util.h,v 1.14 2012/03/30 03:07:07 djm Exp $ */
+/* $Id: bsd-cygwin_util.h,v 1.15 2012/08/28 09:57:19 dtucker Exp $ */
 
 /*
  * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com>
@@ -36,6 +36,8 @@
 
 #undef ERROR
 
+#define WIN32_LEAN_AND_MEAN
+
 #include <windows.h>
 #include <sys/cygwin.h>
 #include <io.h>
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index e37175625..eac5217ca 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -1,4 +1,4 @@
-/* $Id: bsd-misc.h,v 1.20 2012/02/14 18:03:31 tim Exp $ */
+/* $Id: bsd-misc.h,v 1.21 2012/07/03 22:50:10 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
@@ -51,6 +51,9 @@ int setegid(uid_t);
 const char *strerror(int);
 #endif 
 
+#if !defined(HAVE_SETLINEBUF)
+#define setlinebuf(a)   (setvbuf((a), NULL, _IOLBF, 0))
+#endif
 
 #ifndef HAVE_UTIMES
 #ifndef HAVE_STRUCT_TIMEVAL
diff --git a/openbsd-compat/getrrsetbyname-ldns.c b/openbsd-compat/getrrsetbyname-ldns.c
index 8ce5678c9..19666346b 100644
--- a/openbsd-compat/getrrsetbyname-ldns.c
+++ b/openbsd-compat/getrrsetbyname-ldns.c
@@ -205,7 +205,8 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
                 }
 
                 if (rr->_rr_class == rrset->rri_rdclass &&
-                    rr->_rr_type == LDNS_RR_TYPE_RRSIG) {
+                    rr->_rr_type == LDNS_RR_TYPE_RRSIG &&
+                    rrset->rri_sigs) {
                         rdata = &rrset->rri_sigs[index_sig++];
                 }