From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Feb 2020 13:21:00 +0000 (+0000)
Subject: startup: Break out start_sites
X-Git-Tag: v0.6.1~32
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=553de1ddc3e88cb2f198f4ebef12c5464511c165;p=secnet.git

startup: Break out start_sites

We were going to want to change when this happens.  But actually it
seems that is not right.  Keep the commit anyway, as I think it
improves clarity a bit.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/secnet.c b/secnet.c
index 69467de..de16eb3 100644
--- a/secnet.c
+++ b/secnet.c
@@ -187,11 +187,9 @@ static void parse_options(int argc, char **argv)
 static void setup(dict_t *config)
 {
     list_t *l;
-    item_t *site;
     dict_t *system;
     struct passwd *pw;
     struct cloc loc;
-    int i;
 
     l=dict_lookup(config,"system");
 
@@ -226,6 +224,12 @@ static void setup(dict_t *config)
 	      "that secnet retain root privileges while running.",
 	      require_root_privileges_explanation);
     }
+}
+
+static void start_sites(dict_t *config) {
+    int i;
+    list_t *l;
+    item_t *site;
 
     /* Go along site list, starting sites */
     l=dict_lookup(config,sites_key);
@@ -504,6 +508,7 @@ int main(int argc, char **argv)
 
     enter_phase(PHASE_SETUP);
     setup(config);
+    start_sites(config);
 
     if (just_check_config) {
 	Message(M_INFO,"configuration file check complete\n");