diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2013-02-25 11:24:44 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2013-02-25 11:24:44 +1100 |
| commit | 03978c61f32935b31337844aa25d87dc0edd39d2 (patch) | |
| tree | 9467a076b7d4fcf741a3f59bf08096f393bf27d0 | |
| parent | a423fefb89519814ab4a7a44001268648c58ff36 (diff) | |
- (dtucker) [configure.ac ssh-gss.h] bz#2073: additional #includes needed
to use Solaris native GSS libs. Patch from Pierre Ossman.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | ssh-gss.h | 11 |
3 files changed, 26 insertions, 7 deletions
@@ -1,3 +1,7 @@ +20130225 + - (dtucker) [configure.ac ssh-gss.h] bz#2073: additional #includes needed + to use Solaris native GSS libs. Patch from Pierre Ossman. + 20130223 - (djm) [configure.ac includes.h loginrec.c mux.c sftp.c] Prefer bsd/libutil.h to libutil.h to avoid deprecation warnings on Ubuntu. diff --git a/configure.ac b/configure.ac index 3ea3f8a3..f2d67119 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.509 2013/02/22 22:12:24 djm Exp $ +# $Id: configure.ac,v 1.510 2013/02/25 00:24:44 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.509 $) +AC_REVISION($Revision: 1.510 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -3722,6 +3722,20 @@ AC_ARG_WITH([kerberos5], AC_SEARCH_LIBS([k_hasafs], [kafs], [AC_DEFINE([USE_AFS], [1], [Define this if you want to use libkafs' AFS support])]) + + AC_CHECK_DECLS([GSS_C_NT_HOSTBASED_SERVICE], [], [], [[ +#ifdef HAVE_GSSAPI_H +# include <gssapi.h> +#elif defined(HAVE_GSSAPI_GSSAPI_H) +# include <gssapi/gssapi.h> +#endif + +#ifdef HAVE_GSSAPI_GENERIC_H +# include <gssapi_generic.h> +#elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H) +# include <gssapi/gssapi_generic.h> +#endif + ]]) fi ] ) @@ -42,12 +42,13 @@ # include <gssapi/gssapi_generic.h> # endif -/* MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */ +/* Old MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */ -#ifndef GSS_C_NT_HOSTBASED_SERVICE -#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name -#endif /* GSS_C_NT_... */ -#endif /* !HEIMDAL */ +# if !HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE +# define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name +# endif /* !HAVE_DECL_GSS_C_NT_... */ + +# endif /* !HEIMDAL */ #endif /* KRB5 */ /* draft-ietf-secsh-gsskeyex-06 */ |