From dece40fd7729934bc32906e94d3e5e746c01f970 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 18 Sep 2013 10:26:32 -0400 Subject: 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(). --- src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/or/router.c') diff --git a/src/or/router.c b/src/or/router.c index 1ace8e249..a3459aec7 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -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 k. -- cgit v1.2.3