diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.1 | 13 | ||||
-rw-r--r-- | ssh.c | 5 |
3 files changed, 8 insertions, 15 deletions
@@ -42,6 +42,9 @@ | |||
42 | [monitor.c session.c sshlogin.c sshlogin.h] | 42 | [monitor.c session.c sshlogin.c sshlogin.h] |
43 | pass addrlen with sockaddr *; from Hajimu UMEMOTO <ume@FreeBSD.org> | 43 | pass addrlen with sockaddr *; from Hajimu UMEMOTO <ume@FreeBSD.org> |
44 | NOTE: there are also p-specific parts to this patch. ok markus@ | 44 | NOTE: there are also p-specific parts to this patch. ok markus@ |
45 | - stevesk@cvs.openbsd.org 2002/08/29 16:02:54 | ||
46 | [ssh.1 ssh.c] | ||
47 | deprecate -P as UsePrivilegedPort defaults to no now; ok markus@ | ||
45 | 48 | ||
46 | 20020820 | 49 | 20020820 |
47 | - OpenBSD CVS Sync | 50 | - OpenBSD CVS Sync |
@@ -1583,4 +1586,4 @@ | |||
1583 | - (stevesk) entropy.c: typo in debug message | 1586 | - (stevesk) entropy.c: typo in debug message |
1584 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1587 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1585 | 1588 | ||
1586 | $Id: ChangeLog,v 1.2438 2002/09/04 06:45:09 djm Exp $ | 1589 | $Id: ChangeLog,v 1.2439 2002/09/04 06:46:06 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.163 2002/08/17 23:07:14 stevesk Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.164 2002/08/29 16:02:54 stevesk Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -48,7 +48,7 @@ | |||
48 | .Op Ar command | 48 | .Op Ar command |
49 | .Pp | 49 | .Pp |
50 | .Nm ssh | 50 | .Nm ssh |
51 | .Op Fl afgknqstvxACNPTX1246 | 51 | .Op Fl afgknqstvxACNTX1246 |
52 | .Op Fl b Ar bind_address | 52 | .Op Fl b Ar bind_address |
53 | .Op Fl c Ar cipher_spec | 53 | .Op Fl c Ar cipher_spec |
54 | .Op Fl e Ar escape_char | 54 | .Op Fl e Ar escape_char |
@@ -523,15 +523,6 @@ command-line flag. | |||
523 | Port to connect to on the remote host. | 523 | Port to connect to on the remote host. |
524 | This can be specified on a | 524 | This can be specified on a |
525 | per-host basis in the configuration file. | 525 | per-host basis in the configuration file. |
526 | .It Fl P | ||
527 | Use a non-privileged port for outgoing connections. | ||
528 | This can be used if a firewall does | ||
529 | not permit connections from privileged ports. | ||
530 | Note that this option turns off | ||
531 | .Cm RhostsAuthentication | ||
532 | and | ||
533 | .Cm RhostsRSAAuthentication | ||
534 | for older servers. | ||
535 | .It Fl q | 526 | .It Fl q |
536 | Quiet mode. | 527 | Quiet mode. |
537 | Causes all warning and diagnostic messages to be suppressed. | 528 | Causes all warning and diagnostic messages to be suppressed. |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.182 2002/07/19 17:42:40 stevesk Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.183 2002/08/29 16:02:54 stevesk Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -174,7 +174,6 @@ usage(void) | |||
174 | fprintf(stderr, " -v Verbose; display verbose debugging messages.\n"); | 174 | fprintf(stderr, " -v Verbose; display verbose debugging messages.\n"); |
175 | fprintf(stderr, " Multiple -v increases verbosity.\n"); | 175 | fprintf(stderr, " Multiple -v increases verbosity.\n"); |
176 | fprintf(stderr, " -V Display version number only.\n"); | 176 | fprintf(stderr, " -V Display version number only.\n"); |
177 | fprintf(stderr, " -P Don't allocate a privileged port.\n"); | ||
178 | fprintf(stderr, " -q Quiet; don't display any warning messages.\n"); | 177 | fprintf(stderr, " -q Quiet; don't display any warning messages.\n"); |
179 | fprintf(stderr, " -f Fork into background after authentication.\n"); | 178 | fprintf(stderr, " -f Fork into background after authentication.\n"); |
180 | fprintf(stderr, " -e char Set escape character; ``none'' = disable (default: ~).\n"); | 179 | fprintf(stderr, " -e char Set escape character; ``none'' = disable (default: ~).\n"); |
@@ -303,7 +302,7 @@ again: | |||
303 | case 'g': | 302 | case 'g': |
304 | options.gateway_ports = 1; | 303 | options.gateway_ports = 1; |
305 | break; | 304 | break; |
306 | case 'P': | 305 | case 'P': /* deprecated */ |
307 | options.use_privileged_port = 0; | 306 | options.use_privileged_port = 0; |
308 | break; | 307 | break; |
309 | case 'a': | 308 | case 'a': |