summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config.57
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f0ecbe21a..f466f481e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
8 [sshd_config.5] 8 [sshd_config.5]
9 oops, some unrelated stuff crept into that commit - backout. 9 oops, some unrelated stuff crept into that commit - backout.
10 spotted by jmc@ 10 spotted by jmc@
11 - djm@cvs.openbsd.org 2008/04/05 02:46:02
12 [sshd_config.5]
13 HostbasedAuthentication is supported under Match too
11 14
1220080403 1520080403
13 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile- 16 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile-
@@ -3868,4 +3871,4 @@
3868 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3871 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3869 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3872 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3870 3873
3871$Id: ChangeLog,v 1.4907 2008/05/19 04:28:19 djm Exp $ 3874$Id: ChangeLog,v 1.4908 2008/05/19 04:29:08 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 601b56402..6edaa9260 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd_config.5,v 1.86 2008/04/04 06:44:26 djm Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.87 2008/04/05 02:46:02 djm Exp $
38.Dd $Mdocdate: May 19 2008 $ 38.Dd $Mdocdate: April 5 2008 $
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -566,7 +566,8 @@ Available keywords are
566.Cm ChrootDirectory , 566.Cm ChrootDirectory ,
567.Cm ForceCommand , 567.Cm ForceCommand ,
568.Cm GatewayPorts , 568.Cm GatewayPorts ,
569.Cm GSSApiAuthentication , 569.Cm GSSAPIAuthentication ,
570.Cm HostbasedAuthentication ,
570.Cm KbdInteractiveAuthentication , 571.Cm KbdInteractiveAuthentication ,
571.Cm KerberosAuthentication , 572.Cm KerberosAuthentication ,
572.Cm PasswordAuthentication , 573.Cm PasswordAuthentication ,