summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-04 11:13:17 +1100
committerDamien Miller <djm@mindrot.org>2014-02-04 11:13:17 +1100
commite1e480aee8a9af6cfbe7188667b7b940d6b57f9f (patch)
treea05ca93d3af83fd8c6a290a24a10785b9e25263c
parent7cc194f70d4a5ec9a82d19422eaf18db4a6624c6 (diff)
- jmc@cvs.openbsd.org 2014/01/29 14:04:51
[sshd_config.5] document kbdinteractiveauthentication; requested From: Ross L Richardson dtucker/markus helped explain its workings;
-rw-r--r--ChangeLog6
-rw-r--r--sshd_config.515
2 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 25d9c9aff..aca0044fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,12 @@
25 [monitor.h monitor_wrap.c monitor_wrap.h readconf.c readconf.h] 25 [monitor.h monitor_wrap.c monitor_wrap.h readconf.c readconf.h]
26 [schnorr.c schnorr.h servconf.c servconf.h ssh2.h sshconnect2.c] 26 [schnorr.c schnorr.h servconf.c servconf.h ssh2.h sshconnect2.c]
27 remove experimental, never-enabled JPAKE code; ok markus@ 27 remove experimental, never-enabled JPAKE code; ok markus@
28 - jmc@cvs.openbsd.org 2014/01/29 14:04:51
29 [sshd_config.5]
30 document kbdinteractiveauthentication;
31 requested From: Ross L Richardson
32
33 dtucker/markus helped explain its workings;
28 34
2920140131 3520140131
30 - (djm) [sandbox-seccomp-filter.c sandbox-systrace.c] Allow shutdown(2) 36 - (djm) [sandbox-seccomp-filter.c sandbox-systrace.c] Allow shutdown(2)
diff --git a/sshd_config.5 b/sshd_config.5
index 3b21ea6e7..de330a00c 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: sshd_config.5,v 1.170 2013/12/08 09:53:27 dtucker Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.171 2014/01/29 14:04:51 jmc Exp $
37.Dd $Mdocdate: December 8 2013 $ 37.Dd $Mdocdate: January 29 2014 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -633,6 +633,17 @@ The default is
633for interactive sessions and 633for interactive sessions and
634.Dq throughput 634.Dq throughput
635for non-interactive sessions. 635for non-interactive sessions.
636.It Cm KbdInteractiveAuthentication
637Specifies whether to allow keyboard-interactive authentication.
638The argument to this keyword must be
639.Dq yes
640or
641.Dq no .
642The default is to use whatever value
643.Cm ChallengeResponseAuthentication
644is set to
645(by default
646.Dq yes ) .
636.It Cm KerberosAuthentication 647.It Cm KerberosAuthentication
637Specifies whether the password provided by the user for 648Specifies whether the password provided by the user for
638.Cm PasswordAuthentication 649.Cm PasswordAuthentication