lede-packages-rs

git clone git://archive.git.mtrnord.blog/MTRNord/lede-packages-rs.git
Log | Files | Refs | README | LICENSE

0003-build-ignore-pam_lastlog-when-logwtmp-is-not-availab.patch (2216B)


      1 From bac1ee3033cf22e31730fe3e77ca82bd5ebba692 Mon Sep 17 00:00:00 2001
      2 From: Yousong Zhou <yszhou4tech@gmail.com>
      3 Date: Wed, 17 Jun 2015 21:18:05 +0800
      4 Subject: [PATCH 3/7] build: ignore pam_lastlog when logwtmp is not available.
      5 
      6 * configure.ac: check logwtmp and set COND_BUILD_PAM_LASTLOG
      7 * modules/pam_lastlog/Makefile.am: check COND_BUILD_PAM_LASTLOG
      8 
      9 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
     10 ---
     11  configure.ac        |    2 ++
     12  modules/Makefile.am |    8 ++++++--
     13  2 files changed, 8 insertions(+), 2 deletions(-)
     14 
     15 diff --git a/configure.ac b/configure.ac
     16 index 084071a..ca4bf5b 100644
     17 --- a/configure.ac
     18 +++ b/configure.ac
     19 @@ -536,8 +536,10 @@ AC_CHECK_FUNCS(getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r
     20  AC_CHECK_FUNCS(getgrouplist getline getdelim)
     21  AC_CHECK_FUNCS(inet_ntop inet_pton innetgr)
     22  AC_CHECK_FUNCS([ruserok_af ruserok], [break])
     23 +AC_CHECK_FUNCS([logwtmp])
     24  
     25  AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes -o "$ac_cv_func_ruserok" = yes])
     26 +AM_CONDITIONAL([COND_BUILD_PAM_LASTLOG], [test "$ac_cv_func_logwtmp" = yes])
     27  
     28  AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no])
     29  AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes])
     30 diff --git a/modules/Makefile.am b/modules/Makefile.am
     31 index 9ad26a9..b98dc5c 100644
     32 --- a/modules/Makefile.am
     33 +++ b/modules/Makefile.am
     34 @@ -6,9 +6,13 @@ if COND_BUILD_PAM_RHOSTS
     35  	MAYBE_PAM_RHOSTS = pam_rhosts
     36  endif
     37  
     38 +if COND_BUILD_PAM_LASTLOG
     39 +	MAYBE_PAM_LASTLOG = pam_lastlog
     40 +endif
     41 +
     42  SUBDIRS := pam_access pam_cracklib pam_debug pam_deny pam_echo \
     43  	pam_env pam_exec pam_faildelay pam_filter pam_ftp \
     44 -	pam_group pam_issue pam_keyinit pam_lastlog pam_limits \
     45 +	pam_group pam_issue pam_keyinit pam_limits \
     46  	pam_listfile pam_localuser pam_loginuid pam_mail \
     47  	pam_mkhomedir pam_motd pam_namespace pam_nologin \
     48  	pam_permit pam_pwhistory pam_rootok pam_securetty \
     49 @@ -16,7 +20,7 @@ SUBDIRS := pam_access pam_cracklib pam_debug pam_deny pam_echo \
     50  	pam_succeed_if pam_tally pam_tally2 pam_time pam_timestamp \
     51  	pam_tty_audit pam_umask \
     52  	pam_unix pam_userdb pam_warn pam_wheel pam_xauth \
     53 -	$(MAYBE_PAM_RHOSTS)
     54 +	$(MAYBE_PAM_RHOSTS) $(MAYBE_PAM_LASTLOG)
     55  
     56  CLEANFILES = *~
     57  
     58 -- 
     59 1.7.10.4
     60