diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.ac | 12 |
2 files changed, 10 insertions, 7 deletions
@@ -23,6 +23,9 @@ | |||
23 | Explain the use of SSH fpr visualization using random art, and cite the | 23 | Explain the use of SSH fpr visualization using random art, and cite the |
24 | original scientific paper inspiring that technique. | 24 | original scientific paper inspiring that technique. |
25 | Much help with English and nroff by jmc@, thanks. | 25 | Much help with English and nroff by jmc@, thanks. |
26 | - (dtucker) [configure.ac] Bug #1276: avoid linking against libgssapi, which | ||
27 | despite its name doesn't seem to implement all of GSSAPI. Patch from | ||
28 | Jan Engelhardt, sanity checked by Simon Wilkinson. | ||
26 | 29 | ||
27 | 20080612 | 30 | 20080612 |
28 | - (dtucker) OpenBSD CVS Sync | 31 | - (dtucker) OpenBSD CVS Sync |
@@ -4361,4 +4364,4 @@ | |||
4361 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4364 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4362 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4365 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4363 | 4366 | ||
4364 | $Id: ChangeLog,v 1.5009 2008/06/13 23:04:26 dtucker Exp $ | 4367 | $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 @@ | |||
1 | # $Id: configure.ac,v 1.404 2008/06/11 20:05:12 djm Exp $ | 1 | # $Id: configure.ac,v 1.405 2008/06/13 23:14:46 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.404 $) | 18 | AC_REVISION($Revision: 1.405 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -3363,12 +3363,12 @@ AC_ARG_WITH(kerberos5, | |||
3363 | ) | 3363 | ) |
3364 | AC_SEARCH_LIBS(dn_expand, resolv) | 3364 | AC_SEARCH_LIBS(dn_expand, resolv) |
3365 | 3365 | ||
3366 | AC_CHECK_LIB(gssapi,gss_init_sec_context, | 3366 | AC_CHECK_LIB(gssapi_krb5, gss_init_sec_context, |
3367 | [ AC_DEFINE(GSSAPI) | 3367 | [ AC_DEFINE(GSSAPI) |
3368 | K5LIBS="-lgssapi $K5LIBS" ], | 3368 | K5LIBS="-lgssapi_krb5 $K5LIBS" ], |
3369 | [ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context, | 3369 | [ AC_CHECK_LIB(gssapi, gss_init_sec_context, |
3370 | [ AC_DEFINE(GSSAPI) | 3370 | [ AC_DEFINE(GSSAPI) |
3371 | K5LIBS="-lgssapi_krb5 $K5LIBS" ], | 3371 | K5LIBS="-lgssapi $K5LIBS" ], |
3372 | AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]), | 3372 | AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]), |
3373 | $K5LIBS) | 3373 | $K5LIBS) |
3374 | ], | 3374 | ], |