From: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Date: Wed, 1 Nov 2023 23:00:03 +0000 (+0100)
Subject: Define SUBUID_FILE/SUBGID_FILE
X-Git-Tag: 4.15.0-rc1~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee3a79c6952f8ca649c286c7f76639d9d1dedaad;p=thirdparty%2Fshadow.git

Define SUBUID_FILE/SUBGID_FILE

These where hard coded, make them definable like SHADOW_FILE

Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
---

diff --git a/lib/defines.h b/lib/defines.h
index 3a280b3ea..66b70b63f 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -167,6 +167,14 @@
 #define SHADOW_FILE "/etc/shadow"
 #endif
 
+#ifndef SUBUID_FILE
+#define SUBUID_FILE "/etc/subuid"
+#endif
+
+#ifndef SUBGID_FILE
+#define SUBGID_FILE "/etc/subgid"
+#endif
+
 #ifdef SHADOWGRP
 #ifndef SGROUP_FILE
 #define SGROUP_FILE "/etc/gshadow"
diff --git a/lib/prefix_flag.c b/lib/prefix_flag.c
index 80793d0ed..9d766818a 100644
--- a/lib/prefix_flag.c
+++ b/lib/prefix_flag.c
@@ -125,10 +125,10 @@ extern const char* process_prefix_flag (const char* short_opt, int argc, char **
 		spw_setdbname(spw_db_file);
 
 #ifdef ENABLE_SUBIDS
-		xasprintf(&suid_db_file, "%s/%s", prefix, "/etc/subuid");
+		xasprintf(&suid_db_file, "%s/%s", prefix, SUBUID_FILE);
 		sub_uid_setdbname(suid_db_file);
 
-		xasprintf(&sgid_db_file, "%s/%s", prefix, "/etc/subgid");
+		xasprintf(&sgid_db_file, "%s/%s", prefix, SUBGID_FILE);
 		sub_gid_setdbname(sgid_db_file);
 #endif
 
diff --git a/lib/subordinateio.c b/lib/subordinateio.c
index 31470c846..5c5c00bea 100644
--- a/lib/subordinateio.c
+++ b/lib/subordinateio.c
@@ -210,7 +210,7 @@ static const struct subordinate_range *find_range(struct commonio_db *db,
         /*
          * We only do special handling for these two files
          */
-        if ((0 != strcmp(db->filename, "/etc/subuid")) && (0 != strcmp(db->filename, "/etc/subgid")))
+        if ((0 != strcmp(db->filename, SUBUID_FILE)) && (0 != strcmp(db->filename, SUBGID_FILE)))
                 return NULL;
 
         /*
@@ -562,7 +562,7 @@ static int remove_range (struct commonio_db *db,
 }
 
 static struct commonio_db subordinate_uid_db = {
-	"/etc/subuid",		/* filename */
+	SUBUID_FILE,		/* filename */
 	&subordinate_ops,	/* ops */
 	NULL,			/* fp */
 #ifdef WITH_SELINUX
@@ -669,7 +669,7 @@ uid_t sub_uid_find_free_range(uid_t min, uid_t max, unsigned long count)
 }
 
 static struct commonio_db subordinate_gid_db = {
-	"/etc/subgid",		/* filename */
+	SUBGID_FILE,		/* filename */
 	&subordinate_ops,	/* ops */
 	NULL,			/* fp */
 #ifdef WITH_SELINUX