don't check for C2 if AFS or DCE (unless they said --with-C2)

diff --git a/configure.in b/configure.in
index 1ad4fe9956068a401c9f2e0a869935241320f97f..6a824d416cde8a74fba86ed9e9a108c1f11ecf66 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -122,11 +122,10 @@ if test -z "$NROFFPROG" ; then
 fi
 
 dnl
-dnl is our OS using shadow passwords?
-dnl XXX - need to add checks for various
-dnl shadow password schemes after OS checks...
+dnl Is this OS using shadow passwords?
+dnl (Cannot check for C2 if using AFS or DCE)
 dnl
-if test -z "$C2"; then
+if test -z "$C2" -a -z "$AFS" -a -z "$DCE"; then
     SUDO_CHECK_SHADOW(AC_DEFINE(HAVE_C2_SECURITY)
     C2=1)
 fi
@@ -193,7 +192,8 @@ case "$OS" in
                    fi
 
                    # shadow pw support
-                   if test -z "$DCE" -a -n "$C2"; then
+                   # XXX - can't hpux 10 use svr4-style shadow?
+                   if -n "$C2"; then
                        SHADOW_TYPE="SPW_HPUX9"
                        AC_DEFINE_UNQUOTED(SHADOW_TYPE, $SHADOW_TYPE)
                    fi
@@ -351,7 +351,7 @@ dnl
 dnl search for various shadow password types unless we already know
 dnl XXX - need to ACDEFINE *something* right???
 dnl
-if test -z "$SKEY" -a -z "$SECURID" -a -z "$AFS" -a -z "$KERB4" -a -z "$KERB5" -a -z "$DCE" -a -n "$C2" -a -z "$SHADOW_TYPE"
+if test -z "$SKEY" -a -z "$SECURID" -a -z "$AFS" -a -z "$DCE" -a -z "$KERB4" -a -z "$KERB5" -a -n "$C2" -a -z "$SHADOW_TYPE"
     then
     echo "checking for shadow password type..."
     AC_CHECK_FUNC(getspnam, SHADOW_TYPE="SPW_SVR4", AC_CHECK_FUNC(getprpwuid, SHADOW_TYPE="SPW_SECUREWARE", [test -f /etc/master.passwd && SHADOW_TYPE="SPW_BSD"]))