diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh_config.5 | 8 | ||||
-rw-r--r-- | sshd_config.5 | 8 |
3 files changed, 12 insertions, 9 deletions
@@ -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 | ||
13 | 20040423 | 16 | 20040423 |
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 |
576 | should be sent to the server. | 576 | should be sent to the server. |
577 | Note that environment passing is only supported for protocol 2, the | 577 | Note that environment passing is only supported for protocol 2, the |
578 | server must also support it and must be configured to accept these | 578 | server must also support it, and the server must be configured to |
579 | enviornment variables. | 579 | accept these environment variables. |
580 | Refer to | 580 | Refer to |
581 | .Cm AcceptEnv | 581 | .Cm AcceptEnv |
582 | in | 582 | in |
@@ -586,7 +586,7 @@ Variables are specified by name, which may contain the wildcard characters | |||
586 | .Ql \&* | 586 | .Ql \&* |
587 | and | 587 | and |
588 | .Ql \&? . | 588 | .Ql \&? . |
589 | Multiple environment variables may be seperated by whitespace or spread | 589 | Multiple environment variables may be separated by whitespace or spread |
590 | across multiple | 590 | across multiple |
591 | .Cm SendEnv | 591 | .Cm SendEnv |
592 | directives. | 592 | directives. |
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 | |||
70 | in | 70 | in |
71 | .Xr ssh_config 5 | 71 | .Xr ssh_config 5 |
72 | for how to configure the client. | 72 | for how to configure the client. |
73 | Note that environment passingis only supported for protocol 2. | 73 | Note that environment passing is only supported for protocol 2. |
74 | Variables are specified by name, which may contain the wildcard characters | 74 | Variables are specified by name, which may contain the wildcard characters |
75 | .Ql \&* | 75 | .Ql \&* |
76 | and | 76 | and |
77 | .Ql \&? . | 77 | .Ql \&? . |
78 | Multiple environment variables may be seperated by whitespace or spread | 78 | Multiple environment variables may be separated by whitespace or spread |
79 | across multiple | 79 | across multiple |
80 | .Cm AcceptEnv | 80 | .Cm AcceptEnv |
81 | directives. | 81 | directives. |
82 | Be warned that some enviornment variables could be used to bypass restricted | 82 | Be warned that some environment variables could be used to bypass restricted |
83 | user environments. | 83 | user environments. |
84 | For this reason, care should be taken in the use of this directive. | 84 | For this reason, care should be taken in the use of this directive. |
85 | The default is not to accept any environment variables. | 85 | The default is not to accept any environment variables. |