projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't put the --recursive option in .astylerc.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
022fb53
..
1ee8769
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-29,16
+29,12
@@
#define _P1003_1B_VISIBLE
#endif
#define _P1003_1B_VISIBLE
#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
#ifdef HAVE_LZO
#include LZO1X_H
#endif
#ifdef HAVE_LZO
#include LZO1X_H
#endif
-#ifdef
LZ4_H
-#include
LZ4_H
+#ifdef
HAVE_LZ4
+#include
<lz4.h>
#endif
#ifndef HAVE_MINGW
#endif
#ifndef HAVE_MINGW
@@
-65,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, 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;
#ifdef HAVE_MLOCKALL
/* If nonzero, disable swapping for this process. */
static bool do_mlock = false;
@@
-81,12
+74,6
@@
static bool do_chroot = false;
static const char *switchuser = NULL;
#endif
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;
char **g_argv; /* a copy of the cmdline arguments */
static int status = 1;
@@
-143,7
+130,7
@@
static void usage(bool status) {
"\n"
"Report bugs to tinc@tinc-vpn.org.\n";
"\n"
"Report bugs to tinc@tinc-vpn.org.\n";
-
fprintf(stderr,
message, program_name);
+
printf(
message, program_name);
}
}
}
}