From 374ae3dc99e5d8a5a176939c3846e790e890a0e7 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Fri, 18 Nov 2022 19:42:12 +0100
Subject: [PATCH] use $username for subgid check

/etc/subgid contains a mapping of user names (not group names) to group
ids as defined in man subgid.
---
 mmdebstrap | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/mmdebstrap b/mmdebstrap
index 583ebb0..d1f56e8 100755
--- a/mmdebstrap
+++ b/mmdebstrap
@@ -421,8 +421,6 @@ sub read_subuid_subgid() {
         return;
     }
 
-    my $groupname = getgrgid $REAL_GROUP_ID;
-
     if (!-e "/etc/subgid") {
         warning "/etc/subgid doesn't exist";
         return;
@@ -436,25 +434,25 @@ sub read_subuid_subgid() {
       or error "cannot open /etc/subgid for reading: $!";
     while (my $line = <$fh>) {
         ($n, $subid, $num_subid) = split(/:/, $line, 3);
-        last if ($n eq $groupname);
+        last if ($n eq $username);
     }
     close $fh;
     if (!length $subid) {
         warning "/etc/subgid is empty";
         return;
     }
-    if ($n ne $groupname) {
-        warning "no entry in /etc/subgid for $groupname";
+    if ($n ne $username) {
+        warning "no entry in /etc/subgid for $username";
         return;
     }
     push @result, ["g", 0, $subid, $num_subid];
 
     if (scalar(@result) < 2) {
-        warning "/etc/subgid does not contain an entry for $groupname";
+        warning "/etc/subgid does not contain an entry for $username";
         return;
     }
     if (scalar(@result) > 2) {
-        warning "/etc/subgid contains multiple entries for $groupname";
+        warning "/etc/subgid contains multiple entries for $username";
         return;
     }