From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Wed, 13 Jul 2011 19:51:21 +0000 (-0400)
Subject: Only run configure with --with-pam-login for RHEL 5 and above.
X-Git-Tag: SUDO_1_7_7~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5d335af14b0ec39a5e94c31b759e25a32b6667c;p=sudo

Only run configure with --with-pam-login for RHEL 5 and above.

--HG--
branch : 1.7
---

diff --git a/mkpkg b/mkpkg
index 12c1d849c..019f59a8b 100755
--- a/mkpkg
+++ b/mkpkg
@@ -122,9 +122,11 @@ case "$osversion" in
     centos*|rhel*)
 	prefix=/usr
 	if [ $osrelease -ge 50 ]; then
-	    # RHEL 5 and up build pies and have audit support
+	    # RHEL 5 and up build pies, have audit support and use a
+	    # separate PAM config file for "sudo -i".
 	    export CFLAGS="-O2 $F_PIE" LDFLAGS="-pie"
 	    configure_opts="${configure_opts}${configure_opts+$tab}--with-linux-audit"
+	    configure_opts="${configure_opts}${configure_opts+$tab}--with-pam-login"
 	    PPVARS="${PPVARS}${PPVARS+$space}linux_audit=1.4.0"
 	fi
 	# Note, must indent with tabs, not spaces due to IFS trickery
@@ -133,7 +135,6 @@ case "$osversion" in
 		--with-logging=syslog
 		--with-logfac=authpriv
 		--with-pam
-		--with-pam-login
 		--enable-zlib=system
 		--with-editor=/bin/vi
 		--with-env-editor