[or-cvs] [tor/release-0.2.1] move the clause above the "if bw is too low" check

[arma@xxxxxxxxxxxxxx]

commit bcbcda309a24ebe9022ad47c023af12877535780
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Mon Feb 7 23:22:45 2011 -0500

    move the clause above the "if bw is too low" check
---
 src/or/config.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 8066a23..a955b17 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3368,6 +3368,11 @@ options_validate(or_options_t *old_options, or_options_t *options,
                            "RelayBandwidthBurst", msg) < 0)
     return -1;
 
+  if (options->RelayBandwidthRate && !options->RelayBandwidthBurst)
+    options->RelayBandwidthBurst = options->RelayBandwidthRate;
+  if (options->RelayBandwidthBurst && !options->RelayBandwidthRate)
+    options->RelayBandwidthRate = options->RelayBandwidthBurst;
+
   if (server_mode(options)) {
     if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) {
       r = tor_snprintf(buf, sizeof(buf),
@@ -3399,11 +3404,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
     }
   }
 
-  if (options->RelayBandwidthRate && !options->RelayBandwidthBurst)
-    options->RelayBandwidthBurst = options->RelayBandwidthRate;
-  if (options->RelayBandwidthBurst && !options->RelayBandwidthRate)
-    options->RelayBandwidthRate = options->RelayBandwidthBurst;
-
   if (options->RelayBandwidthRate > options->RelayBandwidthBurst)
     REJECT("RelayBandwidthBurst must be at least equal "
            "to RelayBandwidthRate.");