]> git.armaanb.net Git - opendoas.git/commitdiff
persist_timestamp: make tmpfs requirement optional and only available on linux
authorDuncaen <mail@duncano.de>
Tue, 12 Dec 2017 13:57:50 +0000 (14:57 +0100)
committerDuncaen <mail@duncano.de>
Tue, 12 Dec 2017 13:58:01 +0000 (14:58 +0100)
persist_timestamp.c

index c8f4bb5ddd70f4242e3c3b5d86c86163cc4b775c..3f2ee18fc0f0c06389581fb2df57ea17493cf407 100644 (file)
 #include "includes.h"
 
 #ifndef TIMESTAMP_DIR
-# define TIMESTAMP_DIR "/tmp/doas"
+#      define TIMESTAMP_DIR "/tmp/doas"
 #endif
-#ifndef TMPFS_MAGIC
-# define TMPFS_MAGIC 0x01021994
+
+#if defined(TIMESTAMP_TMPFS) && defined(__linux__)
+#      ifndef TMPFS_MAGIC
+#              define TMPFS_MAGIC 0x01021994
+#      endif
 #endif
 
 #define        timespecisset(tsp)              ((tsp)->tv_sec || (tsp)->tv_nsec)
@@ -153,8 +156,11 @@ check:
                errx(1, "timestamp directory is not owned by root");
        if (statfs(dir, &sf) == -1)
                err(1, "statfs");
+
+#if defined(TIMESTAMP_TMPFS) && defined(__linux__)
        if (sf.f_type != TMPFS_MAGIC)
                errx(1, "timestamp directory not on tmpfs");
+#endif
 
        free(buf);
        return 0;