Merge branch 'args-parser'

The merge is lazy. Review postponed until next commit.

diff --cc src/Makefile.am
Simple merge

diff --cc src/main.c
index 65b90ea42a5c3a5f414e8dd2ad7de835a3d548e9,4b15ffb5a274b07fcb1be319e4c3ee9e03189408..8199199463aedeba4221ded21a525257909cf51a
--- 1/src/main.c
--- 2/src/main.c
+++ b/src/main.c
@@@ -174,21 -117,17 +83,22 @@@ main(int argc, char **argv
        struct tal *tal;
        int error;
  
-       error = handle_args(argc, argv);
-       if (error)
-               return error;
 +      print_stack_trace_on_segfault();
 +
-       error = rsync_init();
+       error = handle_flags_config(argc, argv);
        if (error)
                return error;
  
 -      print_stack_trace_on_segfault();
 -
+       error = rsync_init(config_get_enable_rsync());
+       if (error)
 -              goto end;
++              goto end1;
+ 
 -      add_rpki_oids();
 +      error = nid_init();
 +      if (error)
-               goto end;
++              goto end2;
 +      error = extension_init();
 +      if (error)
-               goto end;
++              goto end2;
        thvar_init();
        fnstack_store();
        fnstack_push(config_get_tal());
@@@ -207,7 -141,8 +117,9 @@@
                tal_destroy(tal);
        }
  
- end:
++end2:
        rsync_destroy();
 -end:
++end1:
+       free_rpki_config();
        return error;
  }

diff --cc src/rsync/rsync.c
Simple merge