summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2006-12-06 04:54:02 +0000
committerColin Watson <cjwatson@debian.org>2006-12-06 04:54:02 +0000
commit2530562407533bd74c2820fbf91f9a3a6662fe0b (patch)
tree97d21c3b81cfd05336137519a8229fc45abdbad1 /ssh.c
parent879756082fbdacc158ba04e8f770a1229c3daef4 (diff)
* Add ssh -K option, the converse of -k, to enable GSSAPI credential
delegation (closes: #401483).
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/ssh.c b/ssh.c
index a64f1e2dc..a86d0e17b 100644
--- a/ssh.c
+++ b/ssh.c
@@ -157,7 +157,7 @@ static void
157usage(void) 157usage(void)
158{ 158{
159 fprintf(stderr, 159 fprintf(stderr,
160"usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n" 160"usage: ssh [-1246AaCfgKkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
161" [-D [bind_address:]port] [-e escape_char] [-F configfile]\n" 161" [-D [bind_address:]port] [-e escape_char] [-F configfile]\n"
162" [-i identity_file] [-L [bind_address:]port:host:hostport]\n" 162" [-i identity_file] [-L [bind_address:]port:host:hostport]\n"
163" [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" 163" [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"
@@ -244,7 +244,7 @@ main(int ac, char **av)
244 244
245again: 245again:
246 while ((opt = getopt(ac, av, 246 while ((opt = getopt(ac, av,
247 "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNO:PR:S:TVw:XY")) != -1) { 247 "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:KL:MNO:PR:S:TVw:XY")) != -1) {
248 switch (opt) { 248 switch (opt) {
249 case '1': 249 case '1':
250 options.protocol = SSH_PROTO_1; 250 options.protocol = SSH_PROTO_1;
@@ -298,6 +298,9 @@ again:
298 case 'k': 298 case 'k':
299 options.gss_deleg_creds = 0; 299 options.gss_deleg_creds = 0;
300 break; 300 break;
301 case 'K':
302 options.gss_deleg_creds = 1;
303 break;
301 case 'i': 304 case 'i':
302 if (stat(optarg, &st) < 0) { 305 if (stat(optarg, &st) < 0) {
303 fprintf(stderr, "Warning: Identity file %s " 306 fprintf(stderr, "Warning: Identity file %s "