diff options
| author | Damien Miller <djm@mindrot.org> | 2007-03-06 21:21:18 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2007-03-06 21:21:18 +1100 |
| commit | 5737e363c5b8d74ba8caddbcc2458a2c858cf72f (patch) | |
| tree | 68d43d4a69b9227239ac26a26261524f9b42d814 | |
| parent | fd30986c927e66985ddc43b25794651c76ba477c (diff) | |
| download | openssh-git-5737e363c5b8d74ba8caddbcc2458a2c858cf72f.tar.gz | |
- OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2007/03/01 16:19:33
[sshd_config.5]
sort the `match' keywords;
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sshd_config.5 | 4 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +20070306 + - (djm) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2007/03/01 16:19:33 + [sshd_config.5] + sort the `match' keywords; + 20070304 - (djm) [configure.ac] add a --without-openssl-header-check option to configure, as some platforms (OS X) ship OpenSSL headers whose version @@ -2803,4 +2809,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4631 2007/03/05 07:25:20 dtucker Exp $ +$Id: ChangeLog,v 1.4632 2007/03/06 10:21:18 djm Exp $ diff --git a/sshd_config.5 b/sshd_config.5 index bcd0435e..af122144 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -34,7 +34,7 @@ .\" (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.73 2007/03/01 10:28:02 dtucker Exp $ +.\" $OpenBSD: sshd_config.5,v 1.74 2007/03/01 16:19:33 jmc Exp $ .Dd September 25, 1999 .Dt SSHD_CONFIG 5 .Os @@ -516,8 +516,8 @@ Available keywords are .Cm ForceCommand , .Cm GatewayPorts , .Cm GSSApiAuthentication , -.Cm KerberosAuthentication , .Cm KbdInteractiveAuthentication , +.Cm KerberosAuthentication , .Cm PasswordAuthentication , .Cm PermitOpen , .Cm RhostsRSAAuthentication , |