diff options
| author | James Le Cuirot <chewi@aura-online.co.uk> | 2014-08-23 09:46:38 +0100 |
|---|---|---|
| committer | Serge Hallyn <serge.hallyn@ubuntu.com> | 2014-09-04 17:29:23 -0500 |
| commit | 420943657cde8b9f0586c20119c91d9a8f9850bf (patch) | |
| tree | 15350f46fb20fad65201613d4b47ee5fc5815ccd | |
| parent | 4911773b7746ee86229f6a552a806b8e756b74c9 (diff) | |
Fix building without subordinate IDs support
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/usermod.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 25e288d3..cebd415c 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 e7d43513..aa4c2621 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 */ } /* |