summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-13 04:32:00 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-13 04:32:00 +1000
commit1199673393661ceafc3141e5df43c53e9acdba2f (patch)
treefcff68535503030319c42b819787539f40f84713
parent4401e45be6a89f8b2b9f9ba96137107bce39943d (diff)
- jmc@cvs.openbsd.org 2008/06/11 07:30:37
[sshd.8] kill trailing whitespace;
-rw-r--r--ChangeLog8
-rw-r--r--sshd.86
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9609b4d61..14eb11514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120080612
2 - (dtucker) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2008/06/11 07:30:37
4 [sshd.8]
5 kill trailing whitespace;
6
120080611 720080611
2 - (djm) [channels.c configure.ac] 8 - (djm) [channels.c configure.ac]
3 Do not set SO_REUSEADDR on wildcard X11 listeners (X11UseLocalhost=no) 9 Do not set SO_REUSEADDR on wildcard X11 listeners (X11UseLocalhost=no)
@@ -4159,4 +4165,4 @@
4159 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4165 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4160 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4166 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4161 4167
4162$Id: ChangeLog,v 1.4967 2008/06/11 20:05:12 djm Exp $ 4168$Id: ChangeLog,v 1.4968 2008/06/12 18:32:00 dtucker Exp $
diff --git a/sshd.8 b/sshd.8
index 0ae02ea3e..fdbe7abfa 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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.8,v 1.244 2008/06/10 23:06:19 djm Exp $ 37.\" $OpenBSD: sshd.8,v 1.245 2008/06/11 07:30:37 jmc Exp $
38.Dd $Mdocdate: June 10 2008 $ 38.Dd $Mdocdate: June 11 2008 $
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -532,7 +532,7 @@ This option is automatically disabled if
532is enabled. 532is enabled.
533.It Cm from="pattern-list" 533.It Cm from="pattern-list"
534Specifies that in addition to public key authentication, either the canonical 534Specifies that in addition to public key authentication, either the canonical
535name of the remote host or its IP address must be present in the 535name of the remote host or its IP address must be present in the
536comma-separated list of patterns. 536comma-separated list of patterns.
537See 537See
538.Sx PATTERNS 538.Sx PATTERNS