summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sshd_config.54
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 188d04293..0fec02c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120070306
2 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2007/03/01 16:19:33
4 [sshd_config.5]
5 sort the `match' keywords;
6
120070304 720070304
2 - (djm) [configure.ac] add a --without-openssl-header-check option to 8 - (djm) [configure.ac] add a --without-openssl-header-check option to
3 configure, as some platforms (OS X) ship OpenSSL headers whose version 9 configure, as some platforms (OS X) ship OpenSSL headers whose version
@@ -2803,4 +2809,4 @@
2803 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2809 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2804 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2810 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2805 2811
2806$Id: ChangeLog,v 1.4631 2007/03/05 07:25:20 dtucker Exp $ 2812$Id: ChangeLog,v 1.4632 2007/03/06 10:21:18 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index bcd0435e8..af1221445 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
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.73 2007/03/01 10:28:02 dtucker Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.74 2007/03/01 16:19:33 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -516,8 +516,8 @@ Available keywords are
516.Cm ForceCommand , 516.Cm ForceCommand ,
517.Cm GatewayPorts , 517.Cm GatewayPorts ,
518.Cm GSSApiAuthentication , 518.Cm GSSApiAuthentication ,
519.Cm KerberosAuthentication ,
520.Cm KbdInteractiveAuthentication , 519.Cm KbdInteractiveAuthentication ,
520.Cm KerberosAuthentication ,
521.Cm PasswordAuthentication , 521.Cm PasswordAuthentication ,
522.Cm PermitOpen , 522.Cm PermitOpen ,
523.Cm RhostsRSAAuthentication , 523.Cm RhostsRSAAuthentication ,