Merge pull request #9504 from poettering/nss-deadlock

some nss deadlock love

src/basic/env-util.h

@@ -6,6 +6,7 @@
 #include <stdio.h>
 
 #include "macro.h"
+#include "string.h"
 
 bool env_name_is_valid(const char *e);
 bool env_value_is_valid(const char *e);

src/basic/path-util.h

@@ -58,10 +58,10 @@ static inline bool path_equal_ptr(const char *a, const char *b) {
 /* Note: the search terminates on the first NULL item. */
 #define PATH_IN_SET(p, ...)                                     \
         ({                                                      \
-                char **s;                                       \
+                char **_s;                                      \
                 bool _found = false;                            \
-                STRV_FOREACH(s, STRV_MAKE(__VA_ARGS__))         \
-                        if (path_equal(p, *s)) {                \
+                STRV_FOREACH(_s, STRV_MAKE(__VA_ARGS__))        \
+                        if (path_equal(p, *_s)) {               \
                                _found = true;                   \
                                break;                           \
                         }                                       \