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

src/Makefile.am: tcb fixes from mandriva

Browse Source 
1. suidubins -= was breaking build with WITH_TCB.
2. stick libtcb at end of ldlibs list.

Signed-off-by: Serge Hallyn <shallyn@cisco.com>
This commit is contained in:
Serge Hallyn 2018-03-24 23:41:23 -05:00
parent d3790feac0
commit 36244ac1ff
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Makefile.am
View File

@ -53,7 +53,10 @@ usbin_PROGRAMS = \
noinst_PROGRAMS = id sulogin noinst_PROGRAMS = id sulogin
suidbins = su suidbins = su
suidubins = chage chfn chsh expiry gpasswd newgrp passwd suidubins = chage chfn chsh expiry gpasswd newgrp
if !WITH_TCB
suidubins += passwd
endif
if ACCT_TOOLS_SETUID if ACCT_TOOLS_SETUID
suidubins += chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod suidubins += chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod
endif endif
@ -62,14 +65,13 @@ suidubins += newgidmap newuidmap
endif endif
if WITH_TCB if WITH_TCB
suidubins -= passwd
shadowsgidubins = passwd shadowsgidubins = passwd
endif endif
LDADD = $(INTLLIBS) \ LDADD = $(INTLLIBS) \
$(LIBTCB) \
$(top_builddir)/libmisc/libmisc.a \ $(top_builddir)/libmisc/libmisc.a \
$(top_builddir)/lib/libshadow.la $(top_builddir)/lib/libshadow.la \
$(LIBTCB)
if ACCT_TOOLS_SETUID if ACCT_TOOLS_SETUID
LIBPAM_SUID = $(LIBPAM) LIBPAM_SUID = $(LIBPAM)