summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-05-13 13:03:04 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-05-13 13:03:04 +1000
commit2e578f6292934382e7d1e8a9a60bd4fb7de20163 (patch)
tree72c617106e35d58d2cf7ab3d924d4a8ec45f2665
parent8e968a596ae7263de3fbe858a61abb37bfc01f50 (diff)
- jmc@cvs.openbsd.org 2004/05/04 18:36:07
[scp.1] SendEnv here too;
-rw-r--r--ChangeLog6
-rw-r--r--scp.13
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fae09936a..45facb1f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
2 - (dtucker) [configure.ac] Bug #867: Additional tests for res_query in 2 - (dtucker) [configure.ac] Bug #867: Additional tests for res_query in
3 libresolv, fixes problems detecting it on some platforms 3 libresolv, fixes problems detecting it on some platforms
4 (eg Linux/x86-64). From Kurt Roeckx via Debian, ok mouring@ 4 (eg Linux/x86-64). From Kurt Roeckx via Debian, ok mouring@
5 - (dtucker) OpenBSD CVS Sync
6 - jmc@cvs.openbsd.org 2004/05/04 18:36:07
7 [scp.1]
8 SendEnv here too;
5 9
620040502 1020040502
7 - (dtucker) OpenBSD CVS Sync 11 - (dtucker) OpenBSD CVS Sync
@@ -1078,4 +1082,4 @@
1078 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1082 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1079 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1083 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1080 1084
1081$Id: ChangeLog,v 1.3342 2004/05/13 01:56:16 dtucker Exp $ 1085$Id: ChangeLog,v 1.3343 2004/05/13 03:03:04 dtucker Exp $
diff --git a/scp.1 b/scp.1
index 62e08ffae..202ebaadb 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
9.\" 9.\"
10.\" Created: Sun May 7 00:14:37 1995 ylo 10.\" Created: Sun May 7 00:14:37 1995 ylo
11.\" 11.\"
12.\" $OpenBSD: scp.1,v 1.34 2004/05/02 23:17:51 dtucker Exp $ 12.\" $OpenBSD: scp.1,v 1.35 2004/05/04 18:36:07 jmc Exp $
13.\" 13.\"
14.Dd September 25, 1999 14.Dd September 25, 1999
15.Dt SCP 1 15.Dt SCP 1
@@ -150,6 +150,7 @@ For full details of the options listed below, and their possible values, see
150.It PubkeyAuthentication 150.It PubkeyAuthentication
151.It RhostsRSAAuthentication 151.It RhostsRSAAuthentication
152.It RSAAuthentication 152.It RSAAuthentication
153.It SendEnv
153.It ServerAliveInterval 154.It ServerAliveInterval
154.It ServerAliveCountMax 155.It ServerAliveCountMax
155.It SmartcardDevice 156.It SmartcardDevice