From 1d5beb0df962fb12a4c674c5ea8fa9455ee83c76 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 10 May 2007 19:29:39 +0000 Subject: [PATCH] r12719@catbus: nickm | 2007-05-10 15:26:54 -0400 Backport r10071: correctly set the purpose of routers that are inserted by the controller with purpose=controller. svn:r10160 --- ChangeLog | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d744119b97..9d3d55d8b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,10 @@ Changes in version 0.1.2.14 - 2007-0?-?? - Fix a bug in dirserv_remove_invalid() that would cause authorities to corrupt memory under some really unlikely scenarios. + o Minor bugfixes: + - Actually set the purpose correctly for descriptors inserted with + purpose=controller. + Changes in version 0.1.2.13 - 2007-04-24 o Minor fixes: diff --git a/src/or/control.c b/src/or/control.c index a3d6a653fe..6a1006347b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2045,7 +2045,7 @@ get_purpose(char **string, int for_circuits, uint8_t *purpose) ROUTER_PURPOSE_GENERAL; else if (!strcmp(*string, "controller")) *purpose = for_circuits ? CIRCUIT_PURPOSE_CONTROLLER : - ROUTER_PURPOSE_GENERAL; + ROUTER_PURPOSE_CONTROLLER; else { /* not a recognized purpose */ return -1; }