Only set a cookie when we intend to.

svn:r3114

diff --git a/src/or/control.c b/src/or/control.c
index dfe0ea55efbe436aba5868edd3dbeefcff3efcc5..958e5dc804dc290b97db292124331a84641a6006 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -589,8 +589,10 @@ init_cookie_authentication(int enabled)
 {
   char fname[512];
 
-  if (!enabled)
+  if (!enabled) {
     authentication_cookie_is_set = 0;
+    return 0;
+  }
 
   tor_snprintf(fname, sizeof(fname), "%s/control_auth_cookie",
                get_options()->DataDirectory);