Several follow-ups for recent header cleanups (#37785)

src/shared/cryptsetup-util.c

@@ -54,6 +54,12 @@ DLSYM_PROTOTYPE(crypt_token_json_get) = NULL;
 DLSYM_PROTOTYPE(crypt_token_json_set) = NULL;
 #if HAVE_CRYPT_TOKEN_MAX
 DLSYM_PROTOTYPE(crypt_token_max) = NULL;
+#else
+int crypt_token_max(_unused_ const char *type) {
+    assert(streq(type, CRYPT_LUKS2));
+
+    return 32;
+}
 #endif
 #if HAVE_CRYPT_TOKEN_SET_EXTERNAL_PATH
 DLSYM_PROTOTYPE(crypt_token_set_external_path) = NULL;

src/shared/cryptsetup-util.h

@@ -56,11 +56,7 @@ extern DLSYM_PROTOTYPE(crypt_token_json_set);
 extern DLSYM_PROTOTYPE(crypt_token_max);
 #else
 /* As a fallback, use the same hard-coded value libcryptsetup uses internally. */
-static inline int crypt_token_max(_unused_ const char *type) {
-    assert(streq(type, CRYPT_LUKS2));
-
-    return 32;
-}
+int crypt_token_max(_unused_ const char *type);
 #define sym_crypt_token_max(type) crypt_token_max(type)
 #endif
 #if HAVE_CRYPT_TOKEN_SET_EXTERNAL_PATH

src/shared/libcrypt-util.c

@@ -21,6 +21,7 @@
 #include "errno-util.h"
 #include "libcrypt-util.h"
 #include "log.h"
+#include "random-util.h"
 #include "string-util.h"
 #include "strv.h"
 

src/shared/utmp-wtmp.c

@@ -104,7 +104,7 @@ static int write_entry_wtmp(const struct utmpx *store) {
          * simply appended to the end; i.e. basically a log. */
 
         errno = 0;
-        updwtmpx(_PATH_WTMPX, store);
+        updwtmpx(WTMPX_FILE, store);
         if (errno == ENOENT) {
                 /* If utmp/wtmp have been disabled, that's a good thing, hence ignore the error. */
                 log_debug_errno(errno, "Not writing wtmp: %m");