summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2017-09-01 05:50:48 +0000
committerdjm <djm@openbsd.org>2017-09-01 05:50:48 +0000
commitfb3bf07e0bdff9701ebbd03b74b4910ff62c5388 (patch)
treead8e4356bd5f93ff42687400195e9fbca0cdb239
parentRemove the miniroot for the OMAP3 BeagleBoards. Ethernet is on USB and (diff)
downloadwireguard-openbsd-fb3bf07e0bdff9701ebbd03b74b4910ff62c5388.tar.xz
wireguard-openbsd-fb3bf07e0bdff9701ebbd03b74b4910ff62c5388.zip
document available AuthenticationMethods; bz#2453 ok dtucker@
-rw-r--r--usr.bin/ssh/sshd_config.517
1 files changed, 15 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index 7897ecb0e92..7424c7f00df 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/sshd_config.5
@@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd_config.5,v 1.250 2017/07/23 23:37:02 djm Exp $
-.Dd $Mdocdate: July 23 2017 $
+.\" $OpenBSD: sshd_config.5,v 1.251 2017/09/01 05:50:48 djm Exp $
+.Dd $Mdocdate: September 1 2017 $
.Dt SSHD_CONFIG 5
.Os
.Sh NAME
@@ -223,6 +223,19 @@ requires successful authentication using two different public keys.
.Pp
Note that each authentication method listed should also be explicitly enabled
in the configuration.
+.Pp
+The available authentication methods are:
+.Qq gssapi-with-mic ,
+.Qq hostbased ,
+.Qq keyboard-interactive ,
+.Qq none
+(used for access to password-less accounts when
+.Cm PermitEmptyPassword
+is enabled),
+.Qq password
+and
+.Qq publickey .
+
.It Cm AuthorizedKeysCommand
Specifies a program to be used to look up the user's public keys.
The program must be owned by root, not writable by group or others and