[or-cvs] r11136: backport r11119 too (tor/branches/tor-0_1_2-patches/src/or)

[arma at seul.org]

Author: arma
Date: 2007-08-16 12:53:15 -0400 (Thu, 16 Aug 2007)
New Revision: 11136

Modified:
   tor/branches/tor-0_1_2-patches/src/or/control.c
Log:
backport r11119 too


Modified: tor/branches/tor-0_1_2-patches/src/or/control.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/control.c	2007-08-16 16:41:48 UTC (rev 11135)
+++ tor/branches/tor-0_1_2-patches/src/or/control.c	2007-08-16 16:53:15 UTC (rev 11136)
@@ -999,7 +999,7 @@
       used_quoted_string = 1;
     }
   }
-  if (options->CookieAuthentication && authentication_cookie_is_set) {
+  if (options->CookieAuthentication) {
     if (password_len != AUTHENTICATION_COOKIE_LEN) {
       log_warn(LD_CONTROL, "Got authentication cookie with wrong length (%d)",
                (int)password_len);