Attachment 2224 Details for Bug 2073 – sol-ssh-gss.patch

[patch] sol-ssh-gss.patch

sol-ssh-gss.patch (text/plain), 1.58 KB, created by Pierre Ossman on 2013-02-23 03:03:11 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Ossman

Created: 2013-02-23 03:03:11 AEDT

Size: 1.58 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/openssh/configure.ac,v
>retrieving revision 1.508
>diff -u -r1.508 configure.ac
>--- configure.ac	22 Feb 2013 00:37:00 -0000	1.508
>+++ configure.ac	22 Feb 2013 07:30:51 -0000
>@@ -3722,6 +3722,20 @@
> 
> 		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
> 	]
> )
>Index: ssh-gss.h
>===================================================================
>RCS file: /cvs/openssh/ssh-gss.h,v
>retrieving revision 1.12
>diff -u -r1.12 ssh-gss.h
>--- ssh-gss.h	12 Jun 2007 13:40:39 -0000	1.12
>+++ ssh-gss.h	22 Feb 2013 07:30:51 -0000
>@@ -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 */

Actions: View | Diff

Attachments on bug 2073: 2222 | 2224