[tor-commits] [tor/master] dirauth: Refactor some config checks

[teor at torproject.org]

commit 3881ac2c8655c56f9451ad33c6ea297559ad9279
Author: teor <teor at torproject.org>
Date:   Tue Oct 29 00:33:31 2019 +1000

    dirauth: Refactor some config checks
    
    Minor cleanup and simplification.
    
    Part of 32213.
---
 src/feature/dirauth/dirauth_config.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/feature/dirauth/dirauth_config.c b/src/feature/dirauth/dirauth_config.c
index 3334213ab..13700a31b 100644
--- a/src/feature/dirauth/dirauth_config.c
+++ b/src/feature/dirauth/dirauth_config.c
@@ -106,16 +106,16 @@ options_validate_dirauth_mode(const or_options_t *old_options,
     if (options->GuardfractionFile && !old_options) {
       dirserv_read_guardfraction_file(options->GuardfractionFile, NULL);
     }
-  }
 
-  if (options->AuthoritativeDir && !options->DirPort_set)
-    REJECT("Running as authoritative directory, but no DirPort set.");
+    if (!options->DirPort_set)
+      REJECT("Running as authoritative directory, but no DirPort set.");
 
-  if (options->AuthoritativeDir && !options->ORPort_set)
-    REJECT("Running as authoritative directory, but no ORPort set.");
+    if (!options->ORPort_set)
+      REJECT("Running as authoritative directory, but no ORPort set.");
 
-  if (options->AuthoritativeDir && options->ClientOnly)
-    REJECT("Running as authoritative directory, but ClientOnly also set.");
+    if (options->ClientOnly)
+      REJECT("Running as authoritative directory, but ClientOnly also set.");
+  }
 
   return 0;
 }