X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ffsck.c;h=28da620e02cefef48b03fdab373046ac3d63dbde;hb=90cde91141ec61be4354d8deab21edb8fdf01022;hp=fdd584e7e6ec1b424af41eee673eaea5f450f5e3;hpb=cfc9fee931c70554353ce6c4acc3407baac08745;p=tinc diff --git a/src/fsck.c b/src/fsck.c index fdd584e7..28da620e 100644 --- a/src/fsck.c +++ b/src/fsck.c @@ -185,7 +185,7 @@ static void check_conffile(const char *nodename, bool server) { splay_empty_tree(&config); } -#ifdef HAVE_MINGW +#ifdef HAVE_WINDOWS typedef int uid_t; static uid_t getuid(void) { @@ -219,7 +219,7 @@ static void check_key_file_mode(const char *fname) { } } } -#endif // HAVE_MINGW +#endif // HAVE_WINDOWS static char *read_node_name(void) { if(access(tinc_conf, R_OK) == 0) { @@ -541,9 +541,7 @@ static bool check_public_keys(splay_tree_t *config, const char *name, rsa_t *rsa bool success = true; #ifndef DISABLE_LEGACY - rsa_t *rsa_pub = NULL; - read_rsa_public_key(&rsa_pub, config, name); - + rsa_t *rsa_pub = read_rsa_public_key(config, name); success = check_rsa_pubkey(rsa_priv, rsa_pub, host_file); rsa_free(rsa_pub); #endif