]> granicus.if.org Git - sudo/commitdiff
Use PAM by default on AIX 6 and higher.
authorTodd C. Miller <Todd.Miller@courtesan.com>
Tue, 23 Aug 2011 13:50:40 +0000 (09:50 -0400)
committerTodd C. Miller <Todd.Miller@courtesan.com>
Tue, 23 Aug 2011 13:50:40 +0000 (09:50 -0400)
configure
configure.in

index 1b29bed3262953200e60beeec9753725708fd7af..ca90c23b7b76c6289912b521b215c524afa604c3 100755 (executable)
--- a/configure
+++ b/configure
@@ -13749,9 +13749,10 @@ rm -f core conftest.err conftest.$ac_objext \
                fi
                LDFLAGS="$O_LDFLAGS"
 
-               # Use authenticate(3) as the default authentication method
-               if test X"$with_aixauth" = X""; then
-                   for ac_func in authenticate
+               # On AIX 6 and higher default to PAM, else default to LAM
+               case "$OSREV" in
+                   1-5.*)      if test X"$with_aixauth" = X""; then
+                                   for ac_func in authenticate
 do :
   ac_fn_c_check_func "$LINENO" "authenticate" "ac_cv_func_authenticate"
 if test "x$ac_cv_func_authenticate" = xyes; then :
@@ -13762,7 +13763,13 @@ _ACEOF
 fi
 done
 
-               fi
+                               fi
+                               ;;
+                   *)          if test X"$with_pam" = X""; then
+                                   AUTH_EXCL_DEF="PAM"
+                               fi
+                               ;;
+               esac
 
                # AIX analog of nsswitch.conf, enabled by default
 
index ed43c1335a9f614e8ce3e0ca97dd7c9fe8f4ac78..7a59b6a17c6978d24c33df53195c4e3fe5a51845 100644 (file)
@@ -1511,10 +1511,17 @@ case "$host" in
                fi
                LDFLAGS="$O_LDFLAGS"
 
-               # Use authenticate(3) as the default authentication method
-               if test X"$with_aixauth" = X""; then
-                   AC_CHECK_FUNCS(authenticate, [AUTH_EXCL_DEF="AIX_AUTH"])
-               fi
+               # On AIX 6 and higher default to PAM, else default to LAM
+               case "$OSREV" in
+                   [1-5].*)    if test X"$with_aixauth" = X""; then
+                                   AC_CHECK_FUNCS(authenticate, [AUTH_EXCL_DEF="AIX_AUTH"])
+                               fi
+                               ;;
+                   *)          if test X"$with_pam" = X""; then
+                                   AUTH_EXCL_DEF="PAM"
+                               fi
+                               ;;
+               esac
 
                # AIX analog of nsswitch.conf, enabled by default
                AC_ARG_WITH(netsvc, [AS_HELP_STRING([--with-netsvc[[=PATH]]], [path to netsvc.conf])],