X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Ftincd.c;h=bc04f5f25b79d57d0f4d5776b56ad38f3e2b0119;hb=refs%2Ftags%2Frelease-1.0.34;hp=5b6b32940fb737491ec55f52c2653393ed6ed7c0;hpb=21e7eb0afb3b5f332a90b9ed63d6770db791ecb1;p=tinc diff --git a/src/tincd.c b/src/tincd.c index 5b6b3294..bc04f5f2 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -1,7 +1,7 @@ /* tincd.c -- the main file for tincd Copyright (C) 1998-2005 Ivo Timmermans - 2000-2017 Guus Sliepen + 2000-2018 Guus Sliepen 2008 Max Rijevski 2009 Michael Tokarev 2010 Julien Muchembled @@ -363,6 +363,8 @@ static bool parse_options(int argc, char **argv) { /* This function prettyprints the key generation process */ static int indicator(int a, int b, BN_GENCB *cb) { + (void)cb; + switch(a) { case 0: fprintf(stderr, "."); @@ -536,7 +538,7 @@ static void make_names(void) { #endif if(!pidfilename) { - xasprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname); + xasprintf(&pidfilename, RUNSTATEDIR "/%s.pid", identname); } if(!logfilename) { @@ -660,7 +662,7 @@ int main(int argc, char **argv) { if(show_version) { printf("%s version %s\n", PACKAGE, VERSION); - printf("Copyright (C) 1998-2017 Ivo Timmermans, Guus Sliepen and others.\n" + printf("Copyright (C) 1998-2018 Ivo Timmermans, Guus Sliepen and others.\n" "See the AUTHORS file for a complete list.\n\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" "and you are welcome to redistribute it under certain conditions;\n"