captivectrl: Move sure that the settings are always initialised

[ipfire-2.x.git] / src / misc-progs / captivectrl.c

diff --git a/src/misc-progs/captivectrl.c b/src/misc-progs/captivectrl.c
index 1ca2a59117d110ba4843a93af0fd4b0768688303..9479bc6a54d4691dac597a5c575952800d9c6886 100644 (file)
--- a/src/misc-progs/captivectrl.c
+++ b/src/misc-progs/captivectrl.c
@@ -288,17 +288,20 @@ int main(int argc, char** argv) {
        char* intf = NULL;
        client_t* clients = NULL;
 
+       struct keyvalue* captive_portal_settings = NULL;
+       struct keyvalue* ethernet_settings = NULL;
+
        if (!(initsetuid()))
                exit(2);
 
-       struct keyvalue* ethernet_settings = initkeyvalues();
+       ethernet_settings = initkeyvalues();
        if (!readkeyvalues(ethernet_settings, ETHERNET_SETTINGS)) {
                fprintf(stderr, "Could not read %s\n", ETHERNET_SETTINGS);
                r = 1;
                goto END;
        }
 
-       struct keyvalue* captive_portal_settings = initkeyvalues();
+       captive_portal_settings = initkeyvalues();
        if (!readkeyvalues(captive_portal_settings, CAPTIVE_PORTAL_SETTINGS)) {
                fprintf(stderr, "Could not read %s\n", CAPTIVE_PORTAL_SETTINGS);
                r = 1;