summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-10-07 08:36:05 +1100
committerDarren Tucker <dtucker@zip.com.au>2009-10-07 08:36:05 +1100
commit1477ea162c05c09b4b5ebc19ac588fbf469349dc (patch)
tree0781e1e654d8c1811c187cd8c787dd0fc2a8b789
parente54a036219434260f8efd86c8c110141994fcfa1 (diff)
- dtucker@cvs.openbsd.org 2009/08/16 23:29:26
[sshd_config.5] Add PubkeyAuthentication to the list allowed in a Match block (bz #1577)
-rw-r--r--ChangeLog3
-rw-r--r--sshd_config.55
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e94fba2fd..60eae3a42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@
29 [auth.h] 29 [auth.h]
30 remove unused define. markus@ ok. 30 remove unused define. markus@ ok.
31 (Id sync only, Portable still uses this.) 31 (Id sync only, Portable still uses this.)
32 - dtucker@cvs.openbsd.org 2009/08/16 23:29:26
33 [sshd_config.5]
34 Add PubkeyAuthentication to the list allowed in a Match block (bz #1577)
32 35
3320091002 3620091002
34 - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. 37 - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps.
diff --git a/sshd_config.5 b/sshd_config.5
index 588aed56e..54a4480fe 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.106 2009/04/21 15:13:17 stevesk Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.107 2009/08/16 23:29:26 dtucker Exp $
38.Dd $Mdocdate: April 21 2009 $ 38.Dd $Mdocdate: August 16 2009 $
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -614,6 +614,7 @@ Available keywords are
614.Cm PermitEmptyPasswords , 614.Cm PermitEmptyPasswords ,
615.Cm PermitOpen , 615.Cm PermitOpen ,
616.Cm PermitRootLogin , 616.Cm PermitRootLogin ,
617.Cm PubkeyAuthentication ,
617.Cm RhostsRSAAuthentication , 618.Cm RhostsRSAAuthentication ,
618.Cm RSAAuthentication , 619.Cm RSAAuthentication ,
619.Cm X11DisplayOffset , 620.Cm X11DisplayOffset ,