[or-cvs] r12490: Back out parts of r12376: replace file locations in scripts. (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-11-13 21:55:12 -0500 (Tue, 13 Nov 2007)
New Revision: 12490

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/configure.in
   tor/trunk/src/or/connection_or.c
Log:
 r16663@catbus:  nickm | 2007-11-13 21:51:28 -0500
 Back out parts of r12376: replace file locations in scripts.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r16663] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-11-12 20:42:57 UTC (rev 12489)
+++ tor/trunk/ChangeLog	2007-11-14 02:55:12 UTC (rev 12490)
@@ -1,8 +1,8 @@
 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:
     - Exit policies now reject connections that are addressed to a

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2007-11-12 20:42:57 UTC (rev 12489)
+++ tor/trunk/configure.in	2007-11-14 02:55:12 UTC (rev 12490)
@@ -620,6 +620,11 @@
 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

Modified: tor/trunk/src/or/connection_or.c
===================================================================
--- tor/trunk/src/or/connection_or.c	2007-11-12 20:42:57 UTC (rev 12489)
+++ tor/trunk/src/or/connection_or.c	2007-11-14 02:55:12 UTC (rev 12490)
@@ -456,6 +456,9 @@
       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 @@
   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)