394061aa31
security/ssh6: IPv4/v6 ready, socks unavailable, kerberos available (not tested) security/ssh: IPv4 onlyready, socks available, kerberos available (not tested) should be integrated into one whenever socks support becomes aware of getaddrinfo/getnameinfo. two directories with tons of patches/patch-* is a maintenance headache.
27 lines
981 B
Text
27 lines
981 B
Text
$NetBSD: patch-bi,v 1.2 2000/03/20 02:25:56 itojun Exp $
|
|
|
|
--- ssh.c- Wed May 12 20:19:28 1999
|
|
+++ ssh.c Mon Mar 20 09:47:32 2000
|
|
@@ -280,9 +280,9 @@
|
|
fprintf(stderr, " -l user Log in using this user name.\n");
|
|
fprintf(stderr, " -n Redirect input from /dev/null.\n");
|
|
fprintf(stderr, " -a Disable authentication agent forwarding.\n");
|
|
-#if defined(KERBEROS_TGT_PASSING) && defined(KRB5)
|
|
- fprintf(stderr, " -k Disable Kerberos ticket passing.\n");
|
|
-#endif /* defined(KERBEROS_TGT_PASSING) && defined(KRB5) */
|
|
+#ifdef AFS
|
|
+ fprintf(stderr, " -k Disable Kerberos ticket and AFS token passing.\n");
|
|
+#endif /* AFS */
|
|
#ifndef SSH_NO_X11_FORWARDING
|
|
fprintf(stderr, " -x Disable X11 connection forwarding.\n");
|
|
#endif
|
|
@@ -541,6 +541,9 @@
|
|
|
|
case 'k':
|
|
options.kerberos_tgt_passing = 0;
|
|
+#ifdef AFS
|
|
+ options.afs_token_passing = 0;
|
|
+#endif /* AFS */
|
|
break;
|
|
|
|
case 'i':
|