summaryrefslogtreecommitdiff
path: root/openbsd-compat
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-09-07 00:20:47 +0100
committerColin Watson <cjwatson@debian.org>2012-09-07 00:20:47 +0100
commiteab78da6a54225de06271d9c8da650f04a55ed88 (patch)
treeaa258ca77515939f6d89317ff67fbcb0bca08b24 /openbsd-compat
parenta26f5de49df59322fde07f7be91b3e3969c9c238 (diff)
parentc6a2c0334e45419875687d250aed9bea78480f2e (diff)
* 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).
Diffstat (limited to 'openbsd-compat')
-rw-r--r--openbsd-compat/bsd-cygwin_util.h4
-rw-r--r--openbsd-compat/bsd-misc.h5
-rw-r--r--openbsd-compat/getrrsetbyname-ldns.c3
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 @@
1/* $Id: bsd-cygwin_util.h,v 1.14 2012/03/30 03:07:07 djm Exp $ */ 1/* $Id: bsd-cygwin_util.h,v 1.15 2012/08/28 09:57:19 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com> 4 * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com>
@@ -36,6 +36,8 @@
36 36
37#undef ERROR 37#undef ERROR
38 38
39#define WIN32_LEAN_AND_MEAN
40
39#include <windows.h> 41#include <windows.h>
40#include <sys/cygwin.h> 42#include <sys/cygwin.h>
41#include <io.h> 43#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 @@
1/* $Id: bsd-misc.h,v 1.20 2012/02/14 18:03:31 tim Exp $ */ 1/* $Id: bsd-misc.h,v 1.21 2012/07/03 22:50:10 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> 4 * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
@@ -51,6 +51,9 @@ int setegid(uid_t);
51const char *strerror(int); 51const char *strerror(int);
52#endif 52#endif
53 53
54#if !defined(HAVE_SETLINEBUF)
55#define setlinebuf(a) (setvbuf((a), NULL, _IOLBF, 0))
56#endif
54 57
55#ifndef HAVE_UTIMES 58#ifndef HAVE_UTIMES
56#ifndef HAVE_STRUCT_TIMEVAL 59#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,
205 } 205 }
206 206
207 if (rr->_rr_class == rrset->rri_rdclass && 207 if (rr->_rr_class == rrset->rri_rdclass &&
208 rr->_rr_type == LDNS_RR_TYPE_RRSIG) { 208 rr->_rr_type == LDNS_RR_TYPE_RRSIG &&
209 rrset->rri_sigs) {
209 rdata = &rrset->rri_sigs[index_sig++]; 210 rdata = &rrset->rri_sigs[index_sig++];
210 } 211 }
211 212