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

Fix failing chmod calls on installation for suidubins

Browse Source 
suidubins should be suidusbins, since these binaries are installed
${prefix}/sbin. This historically hasn't broken the build because
chmod of newgidmap/newuidmap succeeds, causing make to think the command
succeeded. Configuring shadow with --with-fcaps removes these final two
entries and exposes the chmod failure to make.
This commit is contained in:
Dave Reisner 2019-07-31 13:09:36 -04:00
parent 5afc1c5b5f
commit edf7547ad5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.am
View File

@ -52,13 +52,14 @@ usbin_PROGRAMS = \
# id and groups are from gnu, sulogin from sysvinit # id and groups are from gnu, sulogin from sysvinit
noinst_PROGRAMS = id sulogin noinst_PROGRAMS = id sulogin
suidusbins =
suidbins = su suidbins = su
suidubins = chage chfn chsh expiry gpasswd newgrp suidubins = chage chfn chsh expiry gpasswd newgrp
if !WITH_TCB if !WITH_TCB
suidubins += passwd suidubins += passwd
endif endif
if ACCT_TOOLS_SETUID if ACCT_TOOLS_SETUID
suidubins += chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod suidusbins += chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod
endif endif
if ENABLE_SUBIDS if ENABLE_SUBIDS
if !FCAPS if !FCAPS
@ -134,6 +135,9 @@ install-am: all-am
for i in $(suidubins); do \ for i in $(suidubins); do \
chmod $(suidperms) $(DESTDIR)$(ubindir)/$$i; \ chmod $(suidperms) $(DESTDIR)$(ubindir)/$$i; \
done done
for i in $(suidusbins); do \
chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \
done
if WITH_TCB if WITH_TCB
for i in $(shadowsgidubins); do \ for i in $(shadowsgidubins); do \
chown root:shadow $(DESTDIR)$(ubindir)/$$i; \ chown root:shadow $(DESTDIR)$(ubindir)/$$i; \