Rearrange conflicting tincd globals

diff --git a/src/process.c b/src/process.c
index 7d528f7ec2df8e6aa074ef5110bfae83a7a10509..7deaadfcb3fa366be316e559bc6731c8208cf6e3 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -33,8 +33,12 @@
 bool do_detach = true;
 
 extern char **g_argv;
-extern bool use_logfile;
-extern bool use_syslog;
+
+/* If nonzero, use syslog instead of stderr in no-detach mode. */
+bool use_syslog = false;
+
+/* If nonzero, write log entries to a separate file. */
+bool use_logfile = false;
 
 /* Some functions the less gifted operating systems might lack... */
 

diff --git a/src/process.h b/src/process.h
index 5849752c9f5ce5d2e411f07cdd1e2a96d33d51bc..1aae6dea4237087210bbeea88e7c668397299121 100644 (file)
--- a/src/process.h
+++ b/src/process.h
@@ -24,6 +24,8 @@
 #include "system.h"
 
 extern bool do_detach;
+extern bool use_logfile;
+extern bool use_syslog;
 
 extern bool detach(void);
 

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 02b7399c716b3d00a01302edd67c3e4a66a5e4d3..0049cd93a24646f55640412abfcef207c1a7bd65 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -46,6 +46,9 @@
 #include "ed25519/sha512.h"
 #include "keys.h"
 
+/* If nonzero, use null ciphers and skip all key exchanges. */
+bool bypass_security = false;
+
 int invitation_lifetime;
 ecdsa_t *invitation_key = NULL;
 

diff --git a/src/tincd.c b/src/tincd.c
index 4310181c009b14e5ddbd2d150352802a1425fefc..1ee8769fcaf32d91f745ef9cfdbafd3c7075d3b1 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -61,9 +61,6 @@ static bool show_help = false;
 /* If nonzero, print the version on standard output and exit.  */
 static bool show_version = false;
 
-/* If nonzero, use null ciphers and skip all key exchanges. */
-bool bypass_security = false;
-
 #ifdef HAVE_MLOCKALL
 /* If nonzero, disable swapping for this process. */
 static bool do_mlock = false;
@@ -77,12 +74,6 @@ static bool do_chroot = false;
 static const char *switchuser = NULL;
 #endif
 
-/* If nonzero, write log entries to a separate file. */
-bool use_logfile = false;
-
-/* If nonzero, use syslog instead of stderr in no-detach mode. */
-bool use_syslog = false;
-
 char **g_argv;                  /* a copy of the cmdline arguments */
 
 static int status = 1;