View | Details | Raw Unified | Return to bug 487 | Differences between
and this patch

Collapse All | Expand All

(-)./ssh.c.lanl (-3 / +8 lines)
Lines 159-165 Link Here
159 
	     _PATH_SSH_USER_CONFFILE);
 159 
	     _PATH_SSH_USER_CONFFILE);
160 
	fprintf(stderr, "  -A          Enable authentication agent forwarding.\n");
 160 
	fprintf(stderr, "  -A          Enable authentication agent forwarding.\n");
161 
	fprintf(stderr, "  -a          Disable authentication agent forwarding (default).\n");
 161 
	fprintf(stderr, "  -a          Disable authentication agent forwarding (default).\n");
162 
#ifdef AFS
 162 
#if defined(AFS) || defined(KRB5) || defined(GSSAPI)
163 
	fprintf(stderr, "  -k          Disable Kerberos ticket and AFS token forwarding.\n");
 163 
	fprintf(stderr, "  -k          Disable Kerberos ticket and AFS token forwarding.\n");
164 
#endif				/* AFS */
 164 
#endif				/* AFS */
165 
	fprintf(stderr, "  -X          Enable X11 connection forwarding.\n");
 165 
	fprintf(stderr, "  -X          Enable X11 connection forwarding.\n");
Lines 312-323 Link Here
312 
		case 'A':
 312 
		case 'A':
313 
			options.forward_agent = 1;
 313 
			options.forward_agent = 1;
314 
			break;
 314 
			break;
315 
#ifdef AFS
 315 
#if defined(AFS) || defined(KRB5) || defined(GSSAPI)
316 
		case 'k':
 316 
		case 'k':
317 
			options.kerberos_tgt_passing = 0;
 317 
			options.kerberos_tgt_passing = 0;
318 
#ifdef AFS
318 
			options.afs_token_passing = 0;
 319 
			options.afs_token_passing = 0;
320 
#endif /* AFS */
321 
#ifdef GSSAPI
322 
			options.gss_deleg_creds = 0;
323 
#endif /* GSSAPI */
319 
			break;
 324 
			break;
320 
#endif
 325 
#endif /* KRB5 */
321 
		case 'i':
 326 
		case 'i':
322 
			if (stat(optarg, &st) < 0) {
 327 
			if (stat(optarg, &st) < 0) {
323 
				fprintf(stderr, "Warning: Identity file %s "
 328 
				fprintf(stderr, "Warning: Identity file %s "

Return to bug 487