View | Details | Raw Unified | Return to bug 1312
Collapse All | Expand All

(-)openssh-4.6p1/ssh.1 (+3 lines)
Lines 315-320 Link Here
315
.Fl i
315
.Fl i
316
options (and multiple identities specified in
316
options (and multiple identities specified in
317
configuration files).
317
configuration files).
318
.It Fl K
319
Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI credentials to the server.
320
This can also be specified on a per-host basis in a configuration file.
318
.It Fl k
321
.It Fl k
319
Disables forwarding (delegation) of GSSAPI credentials to the server.
322
Disables forwarding (delegation) of GSSAPI credentials to the server.
320
.It Fl L Xo
323
.It Fl L Xo
(-)openssh-4.6p1/ssh.c (-2 / +6 lines)
Lines 185-191 Link Here
185
usage(void)
185
usage(void)
186
{
186
{
187
	fprintf(stderr,
187
	fprintf(stderr,
188
"usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
188
"usage: ssh [-1246AaCfgKkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
189
"           [-D [bind_address:]port] [-e escape_char] [-F configfile]\n"
189
"           [-D [bind_address:]port] [-e escape_char] [-F configfile]\n"
190
"           [-i identity_file] [-L [bind_address:]port:host:hostport]\n"
190
"           [-i identity_file] [-L [bind_address:]port:host:hostport]\n"
191
"           [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"
191
"           [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"
Lines 272-278 Link Here
272
272
273
 again:
273
 again:
274
	while ((opt = getopt(ac, av,
274
	while ((opt = getopt(ac, av,
275
	    "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
275
	    "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:KL:MNO:PR:S:TVw:XY")) != -1) {
276
		switch (opt) {
276
		switch (opt) {
277
		case '1':
277
		case '1':
278
			options.protocol = SSH_PROTO_1;
278
			options.protocol = SSH_PROTO_1;
Lines 326-331 Link Here
326
		case 'k':
326
		case 'k':
327
			options.gss_deleg_creds = 0;
327
			options.gss_deleg_creds = 0;
328
			break;
328
			break;
329
		case 'K':
330
			options.gss_authentication = 1;
331
			options.gss_deleg_creds = 1;
332
			break;
329
		case 'i':
333
		case 'i':
330
			if (stat(optarg, &st) < 0) {
334
			if (stat(optarg, &st) < 0) {
331
				fprintf(stderr, "Warning: Identity file %s "
335
				fprintf(stderr, "Warning: Identity file %s "

Return to bug 1312