From d86918b6eb854de38a6e02b81466fcc0419cef98 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Wed, 13 Feb 2013 13:44:34 +0100
Subject: chsh-chfn: fix bugs, improve compilation

 * rename --disable-require-password to --disable-chsh-chfn-password

 * is_local() is really unnecessary when linked with libuser

 * fix set_value_libuser() returns codes

 * fix chfn.c, there is no 'pw', but oldf.pw

 * don't link with PAM when--disable-chsh-chfn-password

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 login-utils/Makemodule.am | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'login-utils/Makemodule.am')

diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index 0c5711841..8283935f9 100644
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -59,16 +59,17 @@ dist_man_MANS += \
 	login-utils/chfn.1 \
 	login-utils/chsh.1
 
-chfn_chsh_sources = \
-	login-utils/islocal.c \
-	login-utils/islocal.h \
-	login-utils/auth.c \
-	login-utils/auth.h \
-	login-utils/setpwnam.c \
-	login-utils/setpwnam.h
+chfn_chsh_sources =
 chfn_chsh_cflags = $(SUID_CFLAGS) $(AM_CFLAGS)
 chfn_chsh_ldflags = $(SUID_LDFLAGS) $(AM_LDFLAGS)
-chfn_chsh_ldadd = libcommon.la -lpam -lpam_misc
+chfn_chsh_ldadd = libcommon.la
+
+if CHFN_CHSH_PASSWORD
+chfn_chsh_ldadd += -lpam -lpam_misc
+chfn_chsh_sources += \
+	login-utils/auth.c \
+	login-utils/auth.h
+endif
 
 if HAVE_USER
 chfn_chsh_ldflags += $(LIBUSER_LIBS)
@@ -76,6 +77,12 @@ chfn_chsh_cflags += $(LIBUSER_CFLAGS)
 chfn_chsh_sources+= \
 	login-utils/libuser.c \
 	login-utils/libuser.h
+else
+chfn_chsh_sources += \
+	login-utils/islocal.c \
+	login-utils/islocal.h \
+	login-utils/setpwnam.c \
+	login-utils/setpwnam.h
 endif
 
 if HAVE_SELINUX
-- 
cgit v1.2.3-55-g7522