New upstream release (8.3p1)

Also update GSSAPI key exchange patch from
https://github.com/openssh-gsskex/openssh-gsskex.

1 files changed, 6 insertions, 1 deletions

diff --git a/servconf.h b/servconf.h
index 3fa05fcac..5a2b60512 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.143 2020/01/31 22:42:45 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.144 2020/04/17 03:30:05 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -38,6 +38,11 @@
 #define PERMITOPEN_ANY          0
 #define PERMITOPEN_NONE         -2
 
+/* IgnoreRhosts */
+#define IGNORE_RHOSTS_NO        0
+#define IGNORE_RHOSTS_YES       1
+#define IGNORE_RHOSTS_SHOSTS    2
+
 #define DEFAULT_AUTH_FAIL_MAX   6       /* Default for MaxAuthTries */
 #define DEFAULT_SESSIONS_MAX    10      /* Default for MaxSessions */