projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing m4 files.
[tinc]
/
src
/
fsck.c
diff --git
a/src/fsck.c
b/src/fsck.c
index
8df95ec
..
b90710b
100644
(file)
--- a/
src/fsck.c
+++ b/
src/fsck.c
@@
-155,7
+155,11
@@
static void check_conffile(const char *fname, bool server) {
}
int fsck(const char *argv0) {
}
int fsck(const char *argv0) {
+#ifdef HAVE_MINGW
+ int uid = 0;
+#else
uid_t uid = getuid();
uid_t uid = getuid();
+#endif
// Check that tinc.conf is readable.
// Check that tinc.conf is readable.
@@
-212,6
+216,7
@@
int fsck(const char *argv0) {
return 1;
}
return 1;
}
+#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
if(st.st_mode & 077) {
fprintf(stderr, "WARNING: unsafe file permissions on %s.\n", fname);
if(st.st_uid != uid) {
if(st.st_mode & 077) {
fprintf(stderr, "WARNING: unsafe file permissions on %s.\n", fname);
if(st.st_uid != uid) {
@@
-223,6
+228,7
@@
int fsck(const char *argv0) {
fprintf(stderr, "Fixed permissions of %s.\n", fname);
}
}
fprintf(stderr, "Fixed permissions of %s.\n", fname);
}
}
+#endif
}
#endif
}
#endif
@@
-251,6
+257,7
@@
int fsck(const char *argv0) {
return 1;
}
return 1;
}
+#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
if(st.st_mode & 077) {
fprintf(stderr, "WARNING: unsafe file permissions on %s.\n", fname);
if(st.st_uid != uid) {
if(st.st_mode & 077) {
fprintf(stderr, "WARNING: unsafe file permissions on %s.\n", fname);
if(st.st_uid != uid) {
@@
-262,6
+269,7
@@
int fsck(const char *argv0) {
fprintf(stderr, "Fixed permissions of %s.\n", fname);
}
}
fprintf(stderr, "Fixed permissions of %s.\n", fname);
}
}
+#endif
}
#ifdef DISABLE_LEGACY
}
#ifdef DISABLE_LEGACY
@@
-277,7
+285,7
@@
int fsck(const char *argv0) {
}
// Check for public keys.
}
// Check for public keys.
- // TODO: use RSAPublicKeyFile
and Ed25519PublicKeyFile variables
if present.
+ // TODO: use RSAPublicKeyFile
variable
if present.
snprintf(fname, sizeof fname, "%s/hosts/%s", confbase, name);
if(access(fname, R_OK))
snprintf(fname, sizeof fname, "%s/hosts/%s", confbase, name);
if(access(fname, R_OK))
@@
-338,13
+346,17
@@
int fsck(const char *argv0) {
fprintf(stderr, "WARNING: A public RSA key was found but no private key is known.\n");
}
#endif
fprintf(stderr, "WARNING: A public RSA key was found but no private key is known.\n");
}
#endif
- //
- // TODO: this should read the Ed25519PublicKey config variable instead.
+
ecdsa_t *ecdsa_pub = NULL;
f = fopen(fname, "r");
ecdsa_t *ecdsa_pub = NULL;
f = fopen(fname, "r");
- if(f)
- ecdsa_pub = ecdsa_read_pem_public_key(f);
+ if(f) {
+ ecdsa_pub = get_pubkey(f);
+ if(!f) {
+ rewind(f);
+ ecdsa_pub = ecdsa_read_pem_public_key(f);
+ }
+ }
fclose(f);
if(ecdsa_priv) {
fclose(f);
if(ecdsa_priv) {