emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Fix building without subordinate IDs support

Browse Source 
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
James Le Cuirot 2014-08-23 09:46:38 +01:00 committed by Serge Hallyn
parent 4911773b77
commit 420943657c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile.am
View File

@ -52,10 +52,13 @@ usbin_PROGRAMS = \
noinst_PROGRAMS = id sulogin noinst_PROGRAMS = id sulogin
suidbins = su suidbins = su
suidubins = chage chfn chsh expiry gpasswd newgrp passwd newuidmap newgidmap suidubins = chage chfn chsh expiry gpasswd newgrp passwd
if ACCT_TOOLS_SETUID if ACCT_TOOLS_SETUID
suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod
endif endif
if ENABLE_SUBIDS
suidubins += newgidmap newuidmap
endif
if WITH_TCB if WITH_TCB
suidubins -= passwd suidubins -= passwd

2
src/usermod.c
View File

@ -1361,6 +1361,7 @@ static void process_flags (int argc, char **argv)
exit (E_UID_IN_USE); exit (E_UID_IN_USE);
} }
#ifdef ENABLE_SUBIDS
if ( (vflg || Vflg) if ( (vflg || Vflg)
&& !is_sub_uid) { && !is_sub_uid) {
fprintf (stderr, fprintf (stderr,
@ -1376,6 +1377,7 @@ static void process_flags (int argc, char **argv)
Prog, sub_gid_dbname (), "-w", "-W"); Prog, sub_gid_dbname (), "-w", "-W");
exit (E_USAGE); exit (E_USAGE);
} }
#endif /* ENABLE_SUBIDS */
} }
/* /*