Commit dece40fd authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Fix an assert when disabling ORPort with accounting disabled. 

The problem was that the server_identity_key_is_set() function could
return true under conditions where we don't really have an identity
key -- specifically, where we used to have one, but we stopped being a
server.

This is a fix for 6979; bugfix on 0.2.2.18-alpha where we added that
assertion to get_server_identity_key().
parent b46353b7

changes/bug6979

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Fix an assertion failure that would occur when disabling the

      ORPort setting on a running Tor process while accounting was

      enabled. Fixes bug 6979; bugfix on 0.2.2.18-alpha.

src/or/router.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ get_server_identity_key(void) 
int

server_identity_key_is_set(void)

{

  return server_identitykey != NULL;

  return server_mode(get_options()) && server_identitykey != NULL;

}



/** Set the current client identity key to <b>k</b>.