From 30fd49e606169c57fef2be66594e24991b2fb747 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 14 Jun 2008 09:14:46 +1000
Subject: [PATCH]  - (dtucker) [configure.ac] Bug #1276: avoid linking against
 libgssapi, which    despite its name doesn't seem to implement all of GSSAPI.
  Patch from    Jan Engelhardt, sanity checked by Simon Wilkinson.

---
 ChangeLog    |  5 ++++-
 configure.ac | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f027d95f..7ce1aee6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
      Explain the use of SSH fpr visualization using random art, and cite the
      original scientific paper inspiring that technique.
      Much help with English and nroff by jmc@, thanks.
+ - (dtucker) [configure.ac] Bug #1276: avoid linking against libgssapi, which
+   despite its name doesn't seem to implement all of GSSAPI.  Patch from
+   Jan Engelhardt, sanity checked by Simon Wilkinson.
 
 20080612
  - (dtucker) OpenBSD CVS Sync
@@ -4361,4 +4364,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5009 2008/06/13 23:04:26 dtucker Exp $
+$Id: ChangeLog,v 1.5010 2008/06/13 23:14:46 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 7ad732657..aea6cb312 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.404 2008/06/11 20:05:12 djm Exp $
+# $Id: configure.ac,v 1.405 2008/06/13 23:14:46 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.404 $)
+AC_REVISION($Revision: 1.405 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -3363,12 +3363,12 @@ AC_ARG_WITH(kerberos5,
 			)
 			AC_SEARCH_LIBS(dn_expand, resolv)
 
-			AC_CHECK_LIB(gssapi,gss_init_sec_context,
+			AC_CHECK_LIB(gssapi_krb5, gss_init_sec_context,
 				[ AC_DEFINE(GSSAPI)
-				  K5LIBS="-lgssapi $K5LIBS" ],
-				[ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context,
+				  K5LIBS="-lgssapi_krb5 $K5LIBS" ],
+				[ AC_CHECK_LIB(gssapi, gss_init_sec_context,
 					[ AC_DEFINE(GSSAPI)
-					  K5LIBS="-lgssapi_krb5 $K5LIBS" ],
+					  K5LIBS="-lgssapi $K5LIBS" ],
 					AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]),
 					$K5LIBS)
 				],