[Pkg-shadow-devel] [PATCH 1/2] Fix building without subordinate IDs support

[James Le Cuirot]

---
 src/Makefile.am | 5 ++++-
 src/usermod.c   | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 25e288d..cebd415 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,10 +52,13 @@ usbin_PROGRAMS = \
 noinst_PROGRAMS = id sulogin
 
 suidbins       = su
-suidubins      = chage chfn chsh expiry gpasswd newgrp passwd newuidmap newgidmap
+suidubins      = chage chfn chsh expiry gpasswd newgrp passwd
 if ACCT_TOOLS_SETUID
 	suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod
 endif
+if ENABLE_SUBIDS
+	suidubins += newgidmap newuidmap
+endif
 
 if WITH_TCB
 suidubins -= passwd
diff --git a/src/usermod.c b/src/usermod.c
index e7d4351..aa4c262 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -1361,6 +1361,7 @@ static void process_flags (int argc, char **argv)
 		exit (E_UID_IN_USE);
 	}
 
+#ifdef ENABLE_SUBIDS
 	if (   (vflg || Vflg)
 	    && !is_sub_uid) {
 		fprintf (stderr,
@@ -1376,6 +1377,7 @@ static void process_flags (int argc, char **argv)
 		         Prog, sub_gid_dbname (), "-w", "-W");
 		exit (E_USAGE);
 	}
+#endif				/* ENABLE_SUBIDS */
 }
 
 /*
-- 
2.0.4