backport candidate:

- If we require CookieAuthentication but we fail to write the
  cookie file, we would warn but not exit, and end up in a state
  where no controller could authenticate. Now we exit.
- If we require CookieAuthentication, stop generating a new cookie
  every time we change any piece of our config.


svn:r11117

1 files changed, 4 insertions, 1 deletions

diff --git a/src/or/config.c b/src/or/config.c
index 804ec574f..168d0dbde 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1039,7 +1039,10 @@ options_act(or_options_t *old_options)
   /* Update address policies. */
   policies_parse_from_options(options);
 
-  init_cookie_authentication(options->CookieAuthentication);
+  if (init_cookie_authentication(options->CookieAuthentication) < 0) {
+    log_warn(LD_CONFIG,"Error creating cookie authentication file.");
+    return -1;
+  }
 
   /* reload keys as needed for rendezvous services. */
   if (rend_service_load_keys()<0) {