summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-05-02 22:12:48 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-05-02 22:12:48 +1000
commit1e0c9bf9fb22054f8815c6e6f6e6bc9aec94758b (patch)
treef8c6aa65fd5bf21f398af6edb947b948ff3e8a49
parent46bc075474211c711b102f6278783bb68d7530a8 (diff)
- djm@cvs.openbsd.org 2004/04/28 05:17:10
[ssh_config.5 sshd_config.5] manpage fixes in envpass stuff from Brian Poole (raj AT cerias.purdue.edu)
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.58
-rw-r--r--sshd_config.58
3 files changed, 12 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 52c9eabdd..f8430f083 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 ssh_config.5 sshd_config.5] 9 ssh_config.5 sshd_config.5]
10 bz #815: implement ability to pass specified environment variables from 10 bz #815: implement ability to pass specified environment variables from
11 the client to the server; ok markus@ 11 the client to the server; ok markus@
12 - djm@cvs.openbsd.org 2004/04/28 05:17:10
13 [ssh_config.5 sshd_config.5]
14 manpage fixes in envpass stuff from Brian Poole (raj AT cerias.purdue.edu)
12 15
1320040423 1620040423
14 - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno 17 - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno
@@ -1050,4 +1053,4 @@
1050 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1053 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1051 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1054 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1052 1055
1053$Id: ChangeLog,v 1.3334 2004/05/02 12:11:30 dtucker Exp $ 1056$Id: ChangeLog,v 1.3335 2004/05/02 12:12:48 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index fbe8c657d..5915c98d0 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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: ssh_config.5,v 1.32 2004/04/27 09:46:37 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.33 2004/04/28 05:17:10 djm Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -575,8 +575,8 @@ Specifies what variables from the local
575.Xr environ 7 575.Xr environ 7
576should be sent to the server. 576should be sent to the server.
577Note that environment passing is only supported for protocol 2, the 577Note that environment passing is only supported for protocol 2, the
578server must also support it and must be configured to accept these 578server must also support it, and the server must be configured to
579enviornment variables. 579accept these environment variables.
580Refer to 580Refer to
581.Cm AcceptEnv 581.Cm AcceptEnv
582in 582in
@@ -586,7 +586,7 @@ Variables are specified by name, which may contain the wildcard characters
586.Ql \&* 586.Ql \&*
587and 587and
588.Ql \&? . 588.Ql \&? .
589Multiple environment variables may be seperated by whitespace or spread 589Multiple environment variables may be separated by whitespace or spread
590across multiple 590across multiple
591.Cm SendEnv 591.Cm SendEnv
592directives. 592directives.
diff --git a/sshd_config.5 b/sshd_config.5
index b702e5ad4..2ac0a5ff3 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -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_config.5,v 1.30 2004/04/27 09:46:37 djm Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.31 2004/04/28 05:17:10 djm Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -70,16 +70,16 @@ See
70in 70in
71.Xr ssh_config 5 71.Xr ssh_config 5
72for how to configure the client. 72for how to configure the client.
73Note that environment passingis only supported for protocol 2. 73Note that environment passing is only supported for protocol 2.
74Variables are specified by name, which may contain the wildcard characters 74Variables are specified by name, which may contain the wildcard characters
75.Ql \&* 75.Ql \&*
76and 76and
77.Ql \&? . 77.Ql \&? .
78Multiple environment variables may be seperated by whitespace or spread 78Multiple environment variables may be separated by whitespace or spread
79across multiple 79across multiple
80.Cm AcceptEnv 80.Cm AcceptEnv
81directives. 81directives.
82Be warned that some enviornment variables could be used to bypass restricted 82Be warned that some environment variables could be used to bypass restricted
83user environments. 83user environments.
84For this reason, care should be taken in the use of this directive. 84For this reason, care should be taken in the use of this directive.
85The default is not to accept any environment variables. 85The default is not to accept any environment variables.