diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2003-11-24 00:16:36 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2003-11-24 00:16:36 +0000 |
| commit | 77698badf72699bb6a299fa9b4cf772d31988b8c (patch) | |
| tree | d2790668f7b0d6e1052057bf27b1e9d4c286c5a6 /usr.bin/ssh | |
| parent | 8d12f0595e8469d456a11f557e9f69dab4c2ca9e (diff) | |
Make ssh -k mean GSSAPIDelegateCredentials=no. Suggestion & ok markus@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/ssh.1 | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index 10784153383..25de869ad87 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.178 2003/10/11 08:24:08 markus Exp $ +.\" $OpenBSD: ssh.1,v 1.179 2003/11/24 00:16:35 dtucker Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -539,8 +539,7 @@ It is possible to have multiple options (and multiple identities specified in configuration files). .It Fl k -Disables forwarding of Kerberos tickets. -This may also be specified on a per-host basis in the configuration file. +Disables forwarding (delegation) of GSSAPI credentials to the server. .It Fl L Xo .Sm off .Ar port : host : hostport diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index e3f5e4cee19..a2934ded6c4 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.203 2003/11/21 11:57:03 djm Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.204 2003/11/24 00:16:35 dtucker Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -300,7 +300,7 @@ again: options.forward_agent = 1; break; case 'k': - /* ignored for backward compatibility */ + options.gss_deleg_creds = 0; break; case 'i': if (stat(optarg, &st) < 0) { |