diff options
| author |   dtucker <dtucker@openbsd.org> | 2018-07-19 10:28:47 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2018-07-19 10:28:47 +0000 |
| commit | 31c76a1f562c0d7d634bf0131bab8c2de524814c (patch) | |
| tree | 9b0f092fc356ea2e1a7063f29f76148cd9529ae7 /usr.bin/ssh/ssh.c | |
| parent | revert previous, something isn't quite right as clients see ntpd (diff) | |
| download | wireguard-openbsd-31c76a1f562c0d7d634bf0131bab8c2de524814c.tar.xz wireguard-openbsd-31c76a1f562c0d7d634bf0131bab8c2de524814c.zip | |
Deprecate UsePrivilegedPort now that support for running ssh(1)
setuid has been removed, remove supporting code and clean up
references to it in the man pages
We have not shipped ssh(1) the setuid bit since 2002. If ayone
really needs to make connections from a low port number this can
be implemented via a small setuid ProxyCommand.
ok markus@ jmc@ djm@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 7192be01772..ac66a8eaddc 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.487 2018/07/18 11:34:04 dtucker Exp $ */ +/* $OpenBSD: ssh.c,v 1.488 2018/07/19 10:28:47 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -709,7 +709,6 @@ main(int ac, char **av) fatal("Invalid multiplex command."); break; case 'P': /* deprecated */ - options.use_privileged_port = 0; break; case 'Q': cp = NULL; @@ -1213,9 +1212,6 @@ main(int ac, char **av) if (options.connection_attempts <= 0) fatal("Invalid number of ConnectionAttempts"); - if (original_effective_uid != 0) - options.use_privileged_port = 0; - if (sshbuf_len(command) != 0 && options.remote_command != NULL) fatal("Cannot execute command-line and remote command."); @@ -1349,8 +1345,7 @@ main(int ac, char **av) /* Open a connection to the remote host. */ if (ssh_connect(ssh, host, addrs, &hostaddr, options.port, options.address_family, options.connection_attempts, - &timeout_ms, options.tcp_keep_alive, - options.use_privileged_port) != 0) + &timeout_ms, options.tcp_keep_alive) != 0) exit(255); if (addrs != NULL) |