Make sure shadow libs don't end up in LIBS, only SUDOERS_LIBS (and

SUDO_LIBS if set_auth_parameters() or initprivs() are present.

diff --git a/configure b/configure
index e6fd3bf353014c43110628521d38e8e346958f45..9f60d98c9f7e19c271154dee78ec0f5a2eaabc79 100755 (executable)
--- a/configure
+++ b/configure
@@ -790,8 +790,6 @@ CPPFLAGS
 PROGS
 CFLAGS
 LIBTOOL
-HAVE_SOLARIS_AUDIT
-HAVE_BSM_AUDIT
 target_alias
 host_alias
 build_alias
@@ -2973,8 +2971,6 @@ $as_echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;}
 
 
 
-
-
 
 
 
@@ -17982,6 +17978,12 @@ $as_echo "#define HAVE_ISBLANK 1" >>confdefs.h
  ;;
 esac
 
+
+    for _sym in isblank; do
+       COMPAT_EXP="${COMPAT_EXP}${_sym}
+"
+    done
+
   fi
 
 ac_fn_c_check_func "$LINENO" "memrchr" "ac_cv_func_memrchr"
@@ -20957,7 +20959,7 @@ $as_echo "$ac_cv_search_crypt" >&6; }
 ac_res=$ac_cv_search_crypt
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  test -n "$ac_lib" && SUDOERS_LIBS="${SUDOERS_LIBS} $ac_res"
+  test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"
 fi
 
        LIBS="$_LIBS"
@@ -20979,9 +20981,7 @@ _ACEOF
 fi
 done
 
-       if test "$found" = "yes"; then
-           SUDOERS_LIBS="$SUDOERS_LIBS $shadow_libs"
-       elif test -n "$shadow_libs_optional"; then
+       if test "$found" = "yes" -a -n "$shadow_libs_optional"; then
            LIBS="$LIBS $shadow_libs_optional"
            for ac_func in $shadow_funcs
 do :
@@ -20996,7 +20996,7 @@ fi
 done
 
            if test "$found" = "yes"; then
-               SUDOERS_LIBS="$SUDOERS_LIBS $shadow_libs $shadow_libs_optional"
+               shadow_libs="$shadow_libs $shadow_libs_optional"
            fi
        fi
        if test "$found" = "yes"; then
@@ -21005,9 +21005,10 @@ done
            esac
            test -n "$shadow_defs" && OSDEFS="${OSDEFS} $shadow_defs"
        else
-           LIBS="$_LIBS"
+           shadow_libs=
        fi
        CHECKSHADOW=false
+       LIBS="$_LIBS"
     fi
     if test "$CHECKSHADOW" = "true"; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getspnam" >&5
@@ -21064,7 +21065,7 @@ ac_res=$ac_cv_search_getspnam
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   $as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
- CHECKSHADOW=false; test -n "$ac_lib" && SUDOERS_LIBS="${SUDOERS_LIBS} $ac_res"
+ CHECKSHADOW=false; test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"
 fi
 
     fi
@@ -21123,12 +21124,31 @@ ac_res=$ac_cv_search_getprpwnam
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   $as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
- CHECKSHADOW=false; SECUREWARE=1; test -n "$ac_lib" && SUDOERS_LIBS="${SUDOERS_LIBS} $ac_res"
+ CHECKSHADOW=false; SECUREWARE=1; test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"
 fi
 
     fi
+    if test -n "$shadow_libs"; then
+       # sudoers needs to link with shadow libs for password auth
+       SUDOERS_LIBS="$SUDOERS_LIBS $shadow_libs"
+    fi
     if test -n "$SECUREWARE"; then
-       for ac_func in bigcrypt set_auth_parameters initprivs
+       _LIBS="$LIBS"
+       LIBS="$LIBS $shadow_libs"
+       for ac_func in bigcrypt
+do :
+  ac_fn_c_check_func "$LINENO" "bigcrypt" "ac_cv_func_bigcrypt"
+if test "x$ac_cv_func_bigcrypt" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_BIGCRYPT 1
+_ACEOF
+
+fi
+done
+
+       AUTH_OBJS="$AUTH_OBJS secureware.lo"
+       # set_auth_parameters() and initprivs() are called from sudo.c
+       for ac_func in set_auth_parameters initprivs
 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"
@@ -21136,11 +21156,11 @@ 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
-
+ test -n "$shadow_libs" && SUDO_LIBS="$SUDO_LIBS $shadow_libs"
 fi
 done
 
-       AUTH_OBJS="$AUTH_OBJS secureware.lo"
+       LIBS="$_LIBS"
     fi
 fi
 

diff --git a/configure.ac b/configure.ac
index cfcfaf79d049f45dfdfe6791dd4b224d29506f75..30d9284631003650dd546ec35320ffa2eb20e4d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3306,7 +3306,7 @@ if test ${with_passwd-'no'} != "no"; then
     dnl
     if test -z "$LIB_CRYPT"; then
        _LIBS="$LIBS"
-       AC_SEARCH_LIBS([crypt], [crypt crypt_d ufc], [test -n "$ac_lib" && SUDOERS_LIBS="${SUDOERS_LIBS} $ac_res"])
+       AC_SEARCH_LIBS([crypt], [crypt crypt_d ufc], [test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"])
        LIBS="$_LIBS"
     fi
 
@@ -3315,13 +3315,11 @@ if test ${with_passwd-'no'} != "no"; then
        LIBS="$LIBS $shadow_libs"
        found=no
        AC_CHECK_FUNCS($shadow_funcs, [found=yes])
-       if test "$found" = "yes"; then
-           SUDOERS_LIBS="$SUDOERS_LIBS $shadow_libs"
-       elif test -n "$shadow_libs_optional"; then
+       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
-               SUDOERS_LIBS="$SUDOERS_LIBS $shadow_libs $shadow_libs_optional"
+               shadow_libs="$shadow_libs $shadow_libs_optional"
            fi
        fi
        if test "$found" = "yes"; then
@@ -3330,19 +3328,29 @@ if test ${with_passwd-'no'} != "no"; then
            esac
            test -n "$shadow_defs" && OSDEFS="${OSDEFS} $shadow_defs"
        else
-           LIBS="$_LIBS"
+           shadow_libs=
        fi
        CHECKSHADOW=false
+       LIBS="$_LIBS"
     fi
     if test "$CHECKSHADOW" = "true"; then
-       AC_SEARCH_LIBS([getspnam], [gen], [AC_DEFINE(HAVE_GETSPNAM)] [CHECKSHADOW=false; test -n "$ac_lib" && SUDOERS_LIBS="${SUDOERS_LIBS} $ac_res"])
+       AC_SEARCH_LIBS([getspnam], [gen], [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" && SUDOERS_LIBS="${SUDOERS_LIBS} $ac_res"])
+       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"])
+    fi
+    if test -n "$shadow_libs"; then
+       # sudoers needs to link with shadow libs for password auth
+       SUDOERS_LIBS="$SUDOERS_LIBS $shadow_libs"
     fi
     if test -n "$SECUREWARE"; then
-       AC_CHECK_FUNCS(bigcrypt set_auth_parameters initprivs)
+       _LIBS="$LIBS"
+       LIBS="$LIBS $shadow_libs"
+       AC_CHECK_FUNCS(bigcrypt)
        AUTH_OBJS="$AUTH_OBJS secureware.lo"
+       # set_auth_parameters() and initprivs() are called from sudo.c
+       AC_CHECK_FUNCS(set_auth_parameters initprivs, [test -n "$shadow_libs" && SUDO_LIBS="$SUDO_LIBS $shadow_libs"])
+       LIBS="$_LIBS"
     fi
 fi