diff options
author | Damien Miller <djm@mindrot.org> | 2014-02-04 11:12:56 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-02-04 11:12:56 +1100 |
commit | 7cc194f70d4a5ec9a82d19422eaf18db4a6624c6 (patch) | |
tree | 8bf6b25f93b3ee74dc184349a45125738e89df5b /servconf.h | |
parent | b0f26544cf6f4feeb1a4f6db09fca834f5c9867d (diff) |
- djm@cvs.openbsd.org 2014/01/29 06:18:35
[Makefile.in auth.h auth2-jpake.c auth2.c jpake.c jpake.h monitor.c]
[monitor.h monitor_wrap.c monitor_wrap.h readconf.c readconf.h]
[schnorr.c schnorr.h servconf.c servconf.h ssh2.h sshconnect2.c]
remove experimental, never-enabled JPAKE code; ok markus@
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/servconf.h b/servconf.h index 8812c5aab..752d1c5ae 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.111 2013/12/05 01:16:41 djm Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.112 2014/01/29 06:18:35 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -117,8 +117,6 @@ typedef struct { | |||
117 | * authentication. */ | 117 | * authentication. */ |
118 | int kbd_interactive_authentication; /* If true, permit */ | 118 | int kbd_interactive_authentication; /* If true, permit */ |
119 | int challenge_response_authentication; | 119 | int challenge_response_authentication; |
120 | int zero_knowledge_password_authentication; | ||
121 | /* If true, permit jpake auth */ | ||
122 | int permit_empty_passwd; /* If false, do not permit empty | 120 | int permit_empty_passwd; /* If false, do not permit empty |
123 | * passwords. */ | 121 | * passwords. */ |
124 | int permit_user_env; /* If true, read ~/.ssh/environment */ | 122 | int permit_user_env; /* If true, read ~/.ssh/environment */ |