merge from gssapi branch

1 files changed, 63 insertions, 63 deletions

diff --git a/configure b/configure
index 1fe8a20e9..e8831e5cc 100755
--- a/configure
+++ b/configure
@@ -7302,26 +7302,19 @@ cat >>confdefs.h <<\_ACEOF
 #define SSH_TUN_PREPEND_AF 1
 _ACEOF
 
-
-        { echo "$as_me:$LINENO: checking whether AU_IPv4 is declared" >&5
-echo $ECHO_N "checking whether AU_IPv4 is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_AU_IPv4+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+        { echo "$as_me:$LINENO: checking if we have the Security Authorization Session API" >&5
+echo $ECHO_N "checking if we have the Security Authorization Session API... $ECHO_C" >&6; }
+        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#include <Security/AuthSession.h>
 int
 main ()
 {
-#ifndef AU_IPv4
-  (void) AU_IPv4;
-#endif
-
+SessionCreate(0, 0);
   ;
   return 0;
 }
@@ -7343,48 +7336,39 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_AU_IPv4=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        ac_cv_have_decl_AU_IPv4=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_AU_IPv4" >&5
-echo "${ECHO_T}$ac_cv_have_decl_AU_IPv4" >&6; }
-if test $ac_cv_have_decl_AU_IPv4 = yes; then
-  :
-else
-
-cat >>confdefs.h <<\_ACEOF
-#define AU_IPv4 0
-_ACEOF
-
-            #include <bsm/audit.h>
+  ac_cv_use_security_session_api="yes"
 
 cat >>confdefs.h <<\_ACEOF
-#define LASTLOG_WRITE_PUTUTXLINE 1
+#define USE_SECURITY_SESSION_API 1
 _ACEOF
 
+                 LIBS="$LIBS -framework Security"
+                 { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+        ac_cv_use_security_session_api="no"
+                 { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-        { echo "$as_me:$LINENO: checking if we have the Security Authorization Session API" >&5
-echo $ECHO_N "checking if we have the Security Authorization Session API... $ECHO_C" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        { echo "$as_me:$LINENO: checking if we have an in-memory credentials cache" >&5
+echo $ECHO_N "checking if we have an in-memory credentials cache... $ECHO_C" >&6; }
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <Security/AuthSession.h>
+#include <Kerberos/Kerberos.h>
 int
 main ()
 {
-SessionCreate(0, 0);
+cc_context_t c;
+                 (void) cc_initialize (&c, 0, NULL, NULL);
   ;
   return 0;
 }
@@ -7406,39 +7390,49 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_use_security_session_api="yes"
 
 cat >>confdefs.h <<\_ACEOF
-#define USE_SECURITY_SESSION_API 1
+#define USE_CCAPI 1
 _ACEOF
 
                  LIBS="$LIBS -framework Security"
                  { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
+                 if test "x$ac_cv_use_security_session_api" = "xno"; then
+                        { { echo "$as_me:$LINENO: error: *** Need a security framework to use the credentials cache API ***" >&5
+echo "$as_me: error: *** Need a security framework to use the credentials cache API ***" >&2;}
+   { (exit 1); exit 1; }; }
+                fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-        ac_cv_use_security_session_api="no"
-                 { echo "$as_me:$LINENO: result: no" >&5
+        { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-        { echo "$as_me:$LINENO: checking if we have an in-memory credentials cache" >&5
-echo $ECHO_N "checking if we have an in-memory credentials cache... $ECHO_C" >&6; }
-        cat >conftest.$ac_ext <<_ACEOF
+
+        { echo "$as_me:$LINENO: checking whether AU_IPv4 is declared" >&5
+echo $ECHO_N "checking whether AU_IPv4 is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_AU_IPv4+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <Kerberos/Kerberos.h>
+$ac_includes_default
 int
 main ()
 {
-cc_context_t c;
-                 (void) cc_initialize (&c, 0, NULL, NULL);
+#ifndef AU_IPv4
+  (void) AU_IPv4;
+#endif
+
   ;
   return 0;
 }
@@ -7460,29 +7454,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_AU_IPv4=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_cv_have_decl_AU_IPv4=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_AU_IPv4" >&5
+echo "${ECHO_T}$ac_cv_have_decl_AU_IPv4" >&6; }
+if test $ac_cv_have_decl_AU_IPv4 = yes; then
+  :
+else
 
 cat >>confdefs.h <<\_ACEOF
-#define USE_CCAPI 1
+#define AU_IPv4 0
 _ACEOF
 
-                 LIBS="$LIBS -framework Security"
-                 { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                 if test "x$ac_cv_use_security_session_api" = "xno"; then
-                        { { echo "$as_me:$LINENO: error: *** Need a security framework to use the credentials cache API ***" >&5
-echo "$as_me: error: *** Need a security framework to use the credentials cache API ***" >&2;}
-   { (exit 1); exit 1; }; }
-                fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+            #include <bsm/audit.h>
+
+cat >>confdefs.h <<\_ACEOF
+#define LASTLOG_WRITE_PUTUTXLINE 1
+_ACEOF
 
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         ;;
 *-*-dragonfly*)
         SSHDLIBS="$SSHDLIBS -lcrypt"