POTD skeleton #100.

Signed-off-by: lns <matzeton@googlemail.com>

1 files changed, 11 insertions, 4 deletions

diff --git a/src/main.c b/src/main.c
index 6156bc3..ad6c1a0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -196,11 +196,12 @@ static size_t validate_hostport_option(opt_name on, int process_forward)
     return rc;
 }
 
+#define POSITIVE_VALIDATIONS 3
 static int process_options(int validate_only)
 {
     char *value = NULL;
     struct opt_list *ol;
-    size_t i, siz;
+    size_t i, siz, rc = 0;
 
     siz = validate_hostport_option(OPT_JAIL, 0);
     if (siz && !validate_only) {
@@ -223,6 +224,8 @@ static int process_options(int validate_only)
         jail_preinit(hosts, ports, &jl_ctx, jl_siz);
         jl_pid = jail_init(&jl_ctx, jl_siz);
     }
+    if (siz)
+        rc++;
 
     siz = validate_hostport_option(OPT_PROTOCOL, 1);
     if (siz && !validate_only) {
@@ -246,6 +249,8 @@ static int process_options(int validate_only)
         ssh_protocol_preinit(hosts, ports, &prt_ctx, prt_siz);
         ssh_protocol_init(&prt_ctx, prt_siz);
     }
+    if (siz)
+        rc++;
 
     siz  = validate_hostport_option(OPT_REDIRECT, 1);
     if (siz && !validate_only) {
@@ -269,8 +274,10 @@ static int process_options(int validate_only)
         rdr_preinit(hosts, ports, &rdr_ctx, rdr_siz);
         rdr_init(&rdr_ctx, rdr_siz);
     }
+    if (siz)
+        rc++;
 
-    return 0;
+    return rc;
 }
 
 int main(int argc, char *argv[])
@@ -289,7 +296,7 @@ int main(int argc, char *argv[])
         exit(EXIT_FAILURE);
     }
 
-    if (process_options(1)) {
+    if (process_options(1) != POSITIVE_VALIDATIONS) {
         fprintf(stderr, "%s: invalid config detected\n", argv[0]);
         exit(EXIT_FAILURE);
     }
@@ -346,7 +353,7 @@ int main(int argc, char *argv[])
     ABORT_ON_FATAL( set_master_sighandler(),
         "Master sighandler" );
 
-    ABORT_ON_FATAL( process_options(0),
+    ABORT_ON_FATAL( process_options(0) != POSITIVE_VALIDATIONS,
         "Setup redirect/protocol/jail instances");
 
     while (1) {