r16663@catbus: nickm | 2007-11-13 21:51:28 -0500

 Back out parts of r12376: replace file locations in scripts.

svn:r12490

diff --git a/ChangeLog b/ChangeLog
index 92cd6b25f4d9f492a8fb72329c794aa5e013c9e3..07bd516195ce79221be255d6c6813cdc1374b08c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 Changes in version 0.2.0.12-alpha - 2007-11-??
   o Compile fixes:
     - Make it build on OpenBSD again. Patch from tup.
-
+    - Substitute BINDIR and LOCALSTATEDIR in scripts.  Fixes packaging.
 
 Changes in version 0.2.0.11-alpha - 2007-11-12
   o Security fixes:

diff --git a/configure.in b/configure.in
index f8ad33516e9b40d1cbc84e1a65b56939468ccdc5..9d20e47a3bf2ae1cd874d6bd0c2c3af84289b01a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -620,6 +620,11 @@ AC_SUBST(CONFDIR)
 AH_TEMPLATE([CONFDIR],[tor's configuration directory])
 AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR")
 
+BINDIR=`eval echo $bindir`
+AC_SUBST(BINDIR)
+LOCALSTATEDIR=`eval echo $localstatedir`
+AC_SUBST(LOCALSTATEDIR)
+
 # Set CFLAGS _after_ all the above checks, since our warnings are stricter
 # than autoconf's macros like.
 if test $ac_cv_c_compiler_gnu = yes; then

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index fb29fa58704c64f20b3810574a95a8587e87df4f..4071c9cf8d011313b12001aec8c87b122a67615c 100644 (file)
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -456,6 +456,9 @@ connection_or_get_by_identity_digest(const char *digest)
       continue; /* avoid non-open conns if we can */
     newer = best->_base.timestamp_created < conn->_base.timestamp_created;
 
+    if (best->is_canonical && !conn->is_canonical)
+      continue; /* A canonical connection is best. */
+
     if (!best->_base.or_is_obsolete && conn->_base.or_is_obsolete)
       continue; /* We never prefer obsolete over non-obsolete connections. */
 
@@ -763,7 +766,6 @@ connection_tls_finish_handshake(or_connection_t *conn)
   directory_set_dirty();
 
   if (tor_tls_used_v1_handshake(conn->tls)) {
-
     conn->link_proto = 1;
     if (connection_or_check_valid_tls_handshake(conn, started_here,
                                                 digest_rcvd) < 0)