Fix building without subordinate IDs support

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 25e288d3f00cfc46c1194c8f3f2356324f77aafb..cebd415c6eea2fc73a97476386b71634fc8b1abd 100644 (file)
--- 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 e7d4351337459b5c37b06675d1a44d8df03be1e6..aa4c2621deba860122a2c34ef25dcd25e67bcfa8 100644 (file)
--- 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 */
 }
 
 /*