From: Roger Dingledine <arma@torproject.org>
Date: Fri, 18 Sep 2009 00:32:42 +0000 (-0400)
Subject: Let our config abbreviations rewrite more than once
X-Git-Tag: tor-0.2.2.2-alpha~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67f280feb361ce5f5c0784e56e94cae87b917bba;p=thirdparty%2Ftor.git

Let our config abbreviations rewrite more than once
---

diff --git a/src/or/config.c b/src/or/config.c
index 0712fbee7d..474b887bac 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1515,7 +1515,10 @@ expand_abbrev(config_format_t *fmt, const char *option, int command_line,
                  fmt->abbrevs[i].abbreviated,
                  fmt->abbrevs[i].full);
       }
-      return fmt->abbrevs[i].full;
+      /* Keep going through the list in case we want to rewrite it more.
+       * (We could imagine recursing here, but I don't want to get the
+       * user into an infinite loop if we craft our list wrong.) */
+      option = fmt->abbrevs[i].full;
     }
   }
   return option;