summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd.84
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d352d967..1b9dc9cb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
8 - merge sections on protocols 1 and 2 into a single section 8 - merge sections on protocols 1 and 2 into a single section
9 - remove configuration file section 9 - remove configuration file section
10 ok markus 10 ok markus
11 - jmc@cvs.openbsd.org 2006/02/01 09:11:41
12 [sshd.8]
13 small tweak;
11 14
1220060131 1520060131
13 - (djm) OpenBSD CVS Sync 16 - (djm) OpenBSD CVS Sync
@@ -3809,4 +3812,4 @@
3809 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3812 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3810 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3813 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3811 3814
3812$Id: ChangeLog,v 1.4114 2006/02/01 11:05:25 djm Exp $ 3815$Id: ChangeLog,v 1.4115 2006/02/01 11:05:42 djm Exp $
diff --git a/sshd.8 b/sshd.8
index 0bc5f820a..51d339b65 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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.8,v 1.214 2006/02/01 09:06:50 jmc Exp $ 37.\" $OpenBSD: sshd.8,v 1.215 2006/02/01 09:11:41 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -217,7 +217,7 @@ from making DNS requests unless the authentication
217mechanism or configuration requires it. 217mechanism or configuration requires it.
218Authentication mechanisms that may require DNS include 218Authentication mechanisms that may require DNS include
219.Cm RhostsRSAAuthentication , 219.Cm RhostsRSAAuthentication ,
220.Cm HostbasedAuthentication 220.Cm HostbasedAuthentication ,
221and using a 221and using a
222.Cm from="pattern-list" 222.Cm from="pattern-list"
223option in a key file. 223option in a key file.