From 27943df344af0b81ecce29408fabc2aa702da9b5 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Sat, 27 Sep 2014 10:13:28 -0600
Subject: [PATCH] Only check for -lshadow if we haven't already found
 getspnam() in libc.  Rather than treat this specially, just add -lshadow as
 another place to search in addition to -lgen.

---
 configure    | 23 +----------------------
 configure.ac | 12 +-----------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/configure b/configure
index 66afaec7c..716a6b77d 100755
--- a/configure
+++ b/configure
@@ -3070,7 +3070,6 @@ CHECKSHADOW=true
 shadow_defs=
 shadow_funcs=
 shadow_libs=
-shadow_libs_optional=
 CONFIGURE_ARGS="$@"
 
 RTLD_PRELOAD_VAR="LD_PRELOAD"
@@ -14733,9 +14732,7 @@ fi
 		;;
     *-*-linux*|*-*-k*bsd*-gnu)
 		OSDEFS="${OSDEFS} -D_GNU_SOURCE"
-		# Some Linux versions need to link with -lshadow
 		shadow_funcs="getspnam"
-		shadow_libs_optional="-lshadow"
 		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
 		;;
     *-*-gnu*)
@@ -21323,24 +21320,6 @@ _ACEOF
 fi
 done
 
-	if test "$found" = "yes" -a -n "$shadow_libs_optional"; then
-	    LIBS="$LIBS $shadow_libs_optional"
-	    for ac_func in $shadow_funcs
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- found=yes
-fi
-done
-
-	    if test "$found" = "yes"; then
-		shadow_libs="$shadow_libs $shadow_libs_optional"
-	    fi
-	fi
 	if test "$found" = "yes"; then
 	    case "$shadow_funcs" in
 		*getprpwnam*) SECUREWARE=1;;
@@ -21377,7 +21356,7 @@ return getspnam ();
   return 0;
 }
 _ACEOF
-for ac_lib in '' gen; do
+for ac_lib in '' gen shadow; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
diff --git a/configure.ac b/configure.ac
index b8713cbc5..3f9c6f85b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -226,7 +226,6 @@ CHECKSHADOW=true
 shadow_defs=
 shadow_funcs=
 shadow_libs=
-shadow_libs_optional=
 CONFIGURE_ARGS="$@"
 
 dnl
@@ -1908,9 +1907,7 @@ case "$host" in
 		;;
     *-*-linux*|*-*-k*bsd*-gnu)
 		OSDEFS="${OSDEFS} -D_GNU_SOURCE"
-		# Some Linux versions need to link with -lshadow
 		shadow_funcs="getspnam"
-		shadow_libs_optional="-lshadow"
 		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
 		;;
     *-*-gnu*)
@@ -3430,13 +3427,6 @@ if test ${with_passwd-'no'} != "no"; then
 	LIBS="$LIBS $shadow_libs"
 	found=no
 	AC_CHECK_FUNCS($shadow_funcs, [found=yes])
-	if test "$found" = "yes" -a -n "$shadow_libs_optional"; then
-	    LIBS="$LIBS $shadow_libs_optional"
-	    AC_CHECK_FUNCS($shadow_funcs, [found=yes])
-	    if test "$found" = "yes"; then
-		shadow_libs="$shadow_libs $shadow_libs_optional"
-	    fi
-	fi
 	if test "$found" = "yes"; then
 	    case "$shadow_funcs" in
 		*getprpwnam*) SECUREWARE=1;;
@@ -3449,7 +3439,7 @@ if test ${with_passwd-'no'} != "no"; then
 	LIBS="$_LIBS"
     fi
     if test "$CHECKSHADOW" = "true"; then
-	AC_SEARCH_LIBS([getspnam], [gen], [AC_DEFINE(HAVE_GETSPNAM)] [CHECKSHADOW=false; test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"])
+	AC_SEARCH_LIBS([getspnam], [gen shadow], [AC_DEFINE(HAVE_GETSPNAM)] [CHECKSHADOW=false; test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"])
     fi
     if test "$CHECKSHADOW" = "true"; then
 	AC_SEARCH_LIBS([getprpwnam], [sec security prot], [AC_DEFINE(HAVE_GETPRPWNAM)] [CHECKSHADOW=false; SECUREWARE=1; test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"])
-- 
2.40.0