spawn/UidGid: rename uid, gid to effective_uid, effective_gid

CM4all · Feb 25, 2025 · 7e82650 · 7e82650
1 parent da70674
commit 7e82650
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libcommon b/libcommon
diff --git a/src/Connection.cxx b/src/Connection.cxx
@@ -92,10 +92,10 @@ struct Connection::Translation {
 static void
 CheckChildOptions(const ChildOptions &options)
 {
-	if (options.uid_gid.uid == 0)
+	if (options.uid_gid.effective_uid == 0)
 		throw std::invalid_argument{"Translation response contains no UID"};
 
-	if (options.uid_gid.gid == 0)
+	if (options.uid_gid.effective_gid == 0)
 		throw std::invalid_argument{"Translation response contains no GID"};
 
 	if (!options.HasHome())
@@ -332,8 +332,8 @@ Connection::PrepareChildProcess(PreparedChildProcess &p,
 		}
 	} else {
 #endif // ENABLE_TRANSLATION
-		p.uid_gid.uid = uid;
-		p.uid_gid.gid = gid;
+		p.uid_gid.effective_uid = uid;
+		p.uid_gid.effective_gid = gid;
 
 		if (!home_path.empty())
 			p.ns.mount.home = home_path.c_str();
+2 −2		demo/spawn/RunSpawn.cxx
+6 −0		src/event/Loop.cxx
+84 −0		src/net/PeerCredentials.hxx
+18 −8		src/net/SocketDescriptor.cxx
+4 −7		src/net/SocketDescriptor.hxx
+1 −1		src/net/linux/PeerAuth.cxx
+6 −7		src/net/linux/PeerAuth.hxx
+4 −4		src/spawn/Client.cxx
+4 −3		src/spawn/Config.hxx
+2 −2		src/spawn/Direct.cxx
+3 −3		src/spawn/Launch.cxx
+1 −1		src/spawn/MountNamespaceOptions.cxx
+9 −9		src/spawn/NamespaceOptions.cxx
+6 −6		src/spawn/Server.cxx
+27 −24		src/spawn/UidGid.cxx
+18 −12		src/spawn/UidGid.hxx
+7 −7		src/translation/Parser.cxx