[or-cvs] [tor/master] Let our config abbreviations rewrite more than once

[arma at seul.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Thu, 17 Sep 2009 20:32:42 -0400
Subject: Let our config abbreviations rewrite more than once
Commit: 67f280feb361ce5f5c0784e56e94cae87b917bba

---
 src/or/config.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 0712fbe..474b887 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;
-- 
1.5.6.5