diff options
author | Damien Miller <djm@mindrot.org> | 2005-12-24 14:55:16 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-12-24 14:55:16 +1100 |
commit | d7f308f6d8b3583d8c97fa71cfb9b10f07ee5418 (patch) | |
tree | 534548c52ae50776606206cc1a970c758465be0b | |
parent | 1530f2431ce107abc29f1926badf84a28bb43b86 (diff) |
- stevesk@cvs.openbsd.org 2005/12/21 22:44:26
[sshd.8]
clarify precedence of -p, Port, ListenAddress; ok and help jmc@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.1 | 7 | ||||
-rw-r--r-- | sshd.8 | 10 |
3 files changed, 15 insertions, 7 deletions
@@ -23,6 +23,9 @@ | |||
23 | [ssh.1] | 23 | [ssh.1] |
24 | -Y does X11 forwarding too; | 24 | -Y does X11 forwarding too; |
25 | ok markus | 25 | ok markus |
26 | - stevesk@cvs.openbsd.org 2005/12/21 22:44:26 | ||
27 | [sshd.8] | ||
28 | clarify precedence of -p, Port, ListenAddress; ok and help jmc@ | ||
26 | 29 | ||
27 | 20051220 | 30 | 20051220 |
28 | - (dtucker) OpenBSD CVS Sync | 31 | - (dtucker) OpenBSD CVS Sync |
@@ -3525,4 +3528,4 @@ | |||
3525 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3528 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3526 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3529 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3527 | 3530 | ||
3528 | $Id: ChangeLog,v 1.4045 2005/12/24 03:54:03 djm Exp $ | 3531 | $Id: ChangeLog,v 1.4046 2005/12/24 03:55:16 djm Exp $ |
@@ -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.1,v 1.226 2005/12/21 11:57:25 jmc Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.227 2005/12/21 12:53:31 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -851,9 +851,10 @@ If the | |||
851 | variable is set to | 851 | variable is set to |
852 | .Dq yes | 852 | .Dq yes |
853 | (or see the description of the | 853 | (or see the description of the |
854 | .Fl X | 854 | .Fl X , |
855 | .Fl x , | ||
855 | and | 856 | and |
856 | .Fl x | 857 | .Fl Y |
857 | options above) | 858 | options above) |
858 | and the user is using X11 (the | 859 | and the user is using X11 (the |
859 | .Ev DISPLAY | 860 | .Ev DISPLAY |
@@ -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.209 2005/12/06 22:38:28 reyk Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.210 2005/12/21 22:44:26 stevesk Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -288,8 +288,12 @@ For full details of the options, and their values, see | |||
288 | Specifies the port on which the server listens for connections | 288 | Specifies the port on which the server listens for connections |
289 | (default 22). | 289 | (default 22). |
290 | Multiple port options are permitted. | 290 | Multiple port options are permitted. |
291 | Ports specified in the configuration file are ignored when a | 291 | Ports specified in the configuration file with the |
292 | command-line port is specified. | 292 | .Cm Port |
293 | option are ignored when a command-line port is specified. | ||
294 | Ports specified using the | ||
295 | .Cm ListenAddress | ||
296 | option override command-line ports. | ||
293 | .It Fl q | 297 | .It Fl q |
294 | Quiet mode. | 298 | Quiet mode. |
295 | Nothing is sent to the system log. | 299 | Nothing is sent to the system log. |