Move {uid,gid}_is_*() from basic to shared

Those are functions that express policy, and nothing in basic/ uses
(or should use) them.

diff --git a/src/basic/user-util.h b/src/basic/user-util.h
index 7c142dd1e66e6521f91a2cf73eb247a755870257..13e2c99e6c22e3e563b5ab448b218ecf83a8892a 100644 (file)
--- a/src/basic/user-util.h
+++ b/src/basic/user-util.h
@@ -3,7 +3,7 @@
 
 #include <grp.h>
 #if ENABLE_GSHADOW
-#include <gshadow.h>
+#  include <gshadow.h>
 #endif
 #include <pwd.h>
 #include <shadow.h>
@@ -61,30 +61,6 @@ int take_etc_passwd_lock(const char *root);
 
 #define ETC_PASSWD_LOCK_PATH "/etc/.pwd.lock"
 
-static inline bool uid_is_system(uid_t uid) {
-        return uid <= SYSTEM_UID_MAX;
-}
-
-static inline bool gid_is_system(gid_t gid) {
-        return gid <= SYSTEM_GID_MAX;
-}
-
-static inline bool uid_is_dynamic(uid_t uid) {
-        return DYNAMIC_UID_MIN <= uid && uid <= DYNAMIC_UID_MAX;
-}
-
-static inline bool gid_is_dynamic(gid_t gid) {
-        return uid_is_dynamic((uid_t) gid);
-}
-
-static inline bool uid_is_container(uid_t uid) {
-        return CONTAINER_UID_BASE_MIN <= uid && uid <= CONTAINER_UID_BASE_MAX;
-}
-
-static inline bool gid_is_container(gid_t gid) {
-        return uid_is_container((uid_t) gid);
-}
-
 /* The following macros add 1 when converting things, since UID 0 is a valid UID, while the pointer
  * NULL is special */
 #define PTR_TO_UID(p) ((uid_t) (((uintptr_t) (p))-1))

diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c
index be386df12bc82b8ecde95b537f912223f2574cb1..8388d53dd12067501a7956296640c5f3d1f8e615 100644 (file)
--- a/src/core/dynamic-user.c
+++ b/src/core/dynamic-user.c
@@ -19,6 +19,7 @@
 #include "stdio-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "user-record.h"
 #include "user-util.h"
 
 /* Takes a value generated randomly or by hashing and turns it into a UID in the right range */

diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index 88739ed5bccc22303924d17a8b1d4a95c29bcc8e..662413bd0857245f4a88bb9ff196889cf1e611bb 100644 (file)
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -46,6 +46,7 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tmpfile-util.h"
+#include "user-record.h"
 #include "user-util.h"
 
 /* The maximum size up to which we process coredumps */

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 34ba24daf64c3f2f265195c2ed7c9d7f5f627f04..ab6aadcb7813fe39d39f415abd2ba2d7b8b75fa8 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -55,6 +55,7 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "syslog-util.h"
+#include "user-record.h"
 #include "user-util.h"
 
 #define USER_JOURNALS_MAX 1024

diff --git a/src/shared/condition.c b/src/shared/condition.c
index 1f6105622a512de64b907b74ef774ab386a5a048..af5d48f55be313adf19af3e43446f951b8f4db4c 100644 (file)
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -43,6 +43,7 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "tomoyo-util.h"
+#include "user-record.h"
 #include "user-util.h"
 #include "util.h"
 #include "virt.h"

diff --git a/src/shared/user-record.h b/src/shared/user-record.h
index 357c246ea5f08622e4f45eb7f848950e0d733e5e..b6fe0d846b333ae15eddee454757d2788e1897ed 100644 (file)
--- a/src/shared/user-record.h
+++ b/src/shared/user-record.h
@@ -17,6 +17,30 @@
 /* The default disk size to use when nothing else is specified, relative to free disk space */
 #define USER_DISK_SIZE_DEFAULT_PERCENT 85
 
+static inline bool uid_is_system(uid_t uid) {
+        return uid <= SYSTEM_UID_MAX;
+}
+
+static inline bool gid_is_system(gid_t gid) {
+        return gid <= SYSTEM_GID_MAX;
+}
+
+static inline bool uid_is_dynamic(uid_t uid) {
+        return DYNAMIC_UID_MIN <= uid && uid <= DYNAMIC_UID_MAX;
+}
+
+static inline bool gid_is_dynamic(gid_t gid) {
+        return uid_is_dynamic((uid_t) gid);
+}
+
+static inline bool uid_is_container(uid_t uid) {
+        return CONTAINER_UID_BASE_MIN <= uid && uid <= CONTAINER_UID_BASE_MAX;
+}
+
+static inline bool gid_is_container(gid_t gid) {
+        return uid_is_container((uid_t) gid);
+}
+
 typedef enum UserDisposition {
         USER_INTRINSIC,   /* root and nobody */
         USER_SYSTEM,      /* statically allocated users for system services */

diff --git a/src/test/test-condition.c b/src/test/test-condition.c
index d209c1304c84097aa2819b89a0ee62cb956d4ca0..b42de612003d518936832eab2efb24ac5f53944c 100644 (file)
--- a/src/test/test-condition.c
+++ b/src/test/test-condition.c
@@ -31,6 +31,7 @@
 #include "strv.h"
 #include "tests.h"
 #include "tomoyo-util.h"
+#include "user-record.h"
 #include "user-util.h"
 #include "virt.h"