summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/servconf.h
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2014-04-12 20:22:59 +0000
committerdes <des@FreeBSD.org>2014-04-12 20:22:59 +0000
commitfaff1e38d22d47a8228fbfe7a7e7ae44391d4ca5 (patch)
tree1869bb83deee7739b988ace790deca83cd513254 /crypto/openssh/servconf.h
parent0918f176a2a27c20190030f7d90050e0b1a8e25c (diff)
downloadFreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.zip
FreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.tar.gz
MFH (r263712): upgrade openssh to 6.6p1
MFH (r264308): restore p level in debugging output
Diffstat (limited to 'crypto/openssh/servconf.h')
-rw-r--r--crypto/openssh/servconf.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/openssh/servconf.h b/crypto/openssh/servconf.h
index 5240fe4..36d9966 100644
--- a/crypto/openssh/servconf.h
+++ b/crypto/openssh/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.111 2013/12/05 01:16:41 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.112 2014/01/29 06:18:35 djm Exp $ */
/* $FreeBSD$ */
/*
@@ -118,8 +118,6 @@ typedef struct {
* authentication. */
int kbd_interactive_authentication; /* If true, permit */
int challenge_response_authentication;
- int zero_knowledge_password_authentication;
- /* If true, permit jpake auth */
int permit_empty_passwd; /* If false, do not permit empty
* passwords. */
int permit_user_env; /* If true, read ~/.ssh/environment */
OpenPOWER on IntegriCloud