head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.50 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.48 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.46 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.44 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.42 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.40 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.38 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.36 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.34 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.32 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.30 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.28 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.26 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.24 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.22 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.20 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.18 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.16 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.14 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.12 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.10 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.8 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.6 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.4 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.2 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.1; locks; strict; comment @# @; 1.3 date 2004.06.01.21.50.38; author kristerw; state dead; branches; next 1.2; 1.2 date 2000.03.20.02.25.55; author itojun; state Exp; branches; next 1.1; 1.1 date 99.12.25.05.28.37; author kim; state Exp; branches; next ; desc @@ 1.3 log @Remove obsolete packages, per discussion on tech-pkg. @ text @$NetBSD: patch-bd,v 1.2 2000/03/20 02:25:55 itojun Exp $ --- readconf.c- Wed May 12 20:19:27 1999 +++ readconf.c Mon Mar 20 09:47:24 2000 @@@@ -170,6 +170,9 @@@@ oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts, oBatchMode, oStrictHostKeyChecking, oCompression, oCompressionLevel, oKeepAlives, oUsePrivilegedPort, oKerberosAuthentication, +#ifdef AFS + oAFSTokenPassing, +#endif /* AFS */ oKerberosTgtPassing, oClearAllForwardings, oNumberOfPasswordPrompts, oXauthPath, oGatewayPorts, oPasswordPromptLogin, oPasswordPromptHost } OpCodes; @@@@ -213,6 +216,9 @@@@ { "useprivilegedport", oUsePrivilegedPort }, { "kerberosauthentication", oKerberosAuthentication }, { "kerberostgtpassing", oKerberosTgtPassing }, +#ifdef AFS + { "afstokenpassing", oAFSTokenPassing }, +#endif /* AFS */ { "clearallforwardings", oClearAllForwardings }, { "numberofpasswordprompts", oNumberOfPasswordPrompts }, { "xauthlocation", oXauthPath }, @@@@ -354,6 +360,12 @@@@ intptr = &options->kerberos_tgt_passing; goto parse_flag; +#ifdef AFS + case oAFSTokenPassing: + intptr = &options->afs_token_passing; + goto parse_flag; +#endif /* AFS */ + case oFallBackToRsh: intptr = &options->fallback_to_rsh; goto parse_flag; @@@@ -678,6 +690,9 @@@@ options->rsa_authentication = -1; options->kerberos_authentication = -1; options->kerberos_tgt_passing = -1; +#ifdef AFS + options->afs_token_passing = -1; +#endif /* AFS */ options->tis_authentication = -1; options->password_authentication = -1; options->rhosts_rsa_authentication = -1; @@@@ -724,17 +739,19 @@@@ if (options->rsa_authentication == -1) options->rsa_authentication = 1; if (options->kerberos_authentication == -1) -#if defined(KERBEROS) && defined(KRB5) +#if defined(KRB4) || defined(KRB5) options->kerberos_authentication = 1; -#else /* defined(KERBEROS) && defined(KRB5) */ +#else options->kerberos_authentication = 0; -#endif /* defined(KERBEROS) && defined(KRB5) */ +#endif /* defined(KRB4) || defined(KRB5) */ if (options->kerberos_tgt_passing == -1) -#if defined(KERBEROS_TGT_PASSING) && defined(KRB5) +#if defined(AFS) options->kerberos_tgt_passing = 1; -#else /* defined(KERBEROS_TGT_PASSING) && defined(KRB5) */ + if (options->afs_token_passing == -1) + options->afs_token_passing = 1; +#else options->kerberos_tgt_passing = 0; -#endif /* defined(KERBEROS_TGT_PASSING) && defined(KRB5) */ +#endif /* AFS */ if (options->tis_authentication == -1) options->tis_authentication = 0; if (options->password_authentication == -1) @ 1.2 log @split security/ssh and security/ssh6. 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. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Folded in IPv6 and Kerberos IV patches, so that both can be compiled. This also fixes problems with Kerberos IV and V support clashing (you still have to choose one or the other at compile time, though). Compiles and runs on 1.4O -- needs testing on 1.4.2, and also some closer looking at certain patches (e.g. patch-au has a "#if 0" that could maybe be something else). @ text @d3 3 a5 3 --- readconf.c.orig Wed May 12 07:19:27 1999 +++ readconf.c Fri Dec 24 21:50:42 1999 @@@@ -170,7 +170,13 @@@@ a12 3 +#ifdef ENABLE_ANOTHER_PORT_TRY + oAnotherPort, +#endif /* ENABLE_ANOTHER_PORT_TRY */ d15 1 a15 12 @@@@ -194,6 +200,9 @@@@ { "hostname", oHostName }, { "proxycommand", oProxyCommand }, { "port", oPort }, +#ifdef ENABLE_ANOTHER_PORT_TRY + { "anotherport", oAnotherPort }, +#endif /* ENABLE_ANOTHER_PORT_TRY */ { "cipher", oCipher }, { "remoteforward", oRemoteForward }, { "localforward", oLocalForward }, @@@@ -213,6 +222,9 @@@@ d25 1 a25 1 @@@@ -354,6 +366,12 @@@@ d38 1 a38 14 @@@@ -497,6 +515,12 @@@@ *intptr = value; break; +#ifdef ENABLE_ANOTHER_PORT_TRY + case oAnotherPort: + intptr = &options->another_port; + goto parse_int; +#endif /* ENABLE_ANOTHER_PORT_TRY */ + case oConnectionAttempts: intptr = &options->connection_attempts; goto parse_int; @@@@ -678,6 +702,9 @@@@ d48 1 a48 11 @@@@ -689,6 +716,9 @@@@ options->keepalives = -1; options->compression_level = -1; options->port = -1; +#ifdef ENABLE_ANOTHER_PORT_TRY + options->another_port = -1; +#endif /* ENABLE_ANOTHER_PORT_TRY */ options->connection_attempts = -1; options->number_of_password_prompts = -1; options->password_prompt_login = -1; @@@@ -724,17 +754,19 @@@@ a73 11 @@@@ -759,6 +791,10 @@@@ options->compression_level = 6; if (options->port == -1) options->port = 0; /* Filled in ssh_connect. */ +#ifdef ENABLE_ANOTHER_PORT_TRY + if (options->another_port == -1) + options->another_port = 0; +#endif /* ENABLE_ANOTHER_PORT_TRY */ if (options->connection_attempts == -1) options->connection_attempts = 4; if (options->number_of_password_prompts == -1) @