-static int show_version;
-
-/* If nonzero, it will attempt to kill a running tincd and exit. */
-static int kill_tincd = 0;
-
-/* If nonzero, generate public/private keypair for this host/net. */
-static int generate_keys = 0;
-
-char *identname; /* program name for syslog */
-char *pidfilename; /* pid file location */
-char **g_argv; /* a copy of the cmdline arguments */
-char **environment; /* A pointer to the environment on
- startup */
-
-static struct option const long_options[] =
-{
- { "config", required_argument, NULL, 'c' },
- { "kill", no_argument, NULL, 'k' },
- { "net", required_argument, NULL, 'n' },
- { "help", no_argument, &show_help, 1 },
- { "version", no_argument, &show_version, 1 },
- { "no-detach", no_argument, &do_detach, 0 },
- { "generate-keys", optional_argument, NULL, 'K'},
- { NULL, 0, NULL, 0 }
+static bool show_version = false;
+
+char **g_argv; /* a copy of the cmdline arguments */
+
+static int status = 1;
+
+static struct option const long_options[] = {
+ {"config", required_argument, NULL, 'c'},
+ {"net", required_argument, NULL, 'n'},
+ {"help", no_argument, NULL, 1},
+ {"version", no_argument, NULL, 2},
+ {"no-detach", no_argument, NULL, 'D'},
+ {"debug", optional_argument, NULL, 'd'},
+ {"bypass-security", no_argument, NULL, 3},
+ {"option", required_argument, NULL, 'o'},
+ {NULL, 0, NULL, 0}