From 709dd56c79c70e800f9c71b919b8c0cf7c6c50ce Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Fri, 10 Oct 2003 03:52:03 +0000
Subject: - GSSAPI patch improved for kerbers5 and hemidal

Submitted by:	bg@sics.se
---
 security/hpn-ssh/Makefile               |  5 +++++
 security/hpn-ssh/files/gss-serv.c.patch | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 security/hpn-ssh/files/gss-serv.c.patch

(limited to 'security/hpn-ssh')

diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile
index 083c28144606..7e4e5650af63 100644
--- a/security/hpn-ssh/Makefile
+++ b/security/hpn-ssh/Makefile
@@ -88,6 +88,11 @@ pre-configure:
 	@${ECHO_MSG} !!!! Warning this option uses autoreconf !!!
 	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOCONF_ENV} ${AUTORECONF} \
 		${AUTOCONF_ARGS})
+.else
+.if exists(/usr/include/krb5.h)
+CONFIGURE_ARGS+=        --with-kerberos5
+EXTRA_PATCHES+=         ${FILESDIR}/gss-serv.c.patch
+.endif
 .endif
 
 post-configure:
diff --git a/security/hpn-ssh/files/gss-serv.c.patch b/security/hpn-ssh/files/gss-serv.c.patch
new file mode 100644
index 000000000000..434f71e6d057
--- /dev/null
+++ b/security/hpn-ssh/files/gss-serv.c.patch
@@ -0,0 +1,18 @@
+--- gss-serv.c.DIST	Tue Sep  2 14:56:42 2003
++++ gss-serv.c	Mon Oct  6 17:56:23 2003
+@@ -138,6 +138,15 @@
+ 	OM_uint32 offset;
+ 	OM_uint32 oidl;
+ 
++#if defined(HEIMDAL)
++	if (strcmp(heimdal_version, "Heimdal 0.6") < 0) {
++	    name->length = ename->length;
++	    name->value = xmalloc(name->length+1);
++	    memcpy(name->value,ename->value,name->length);
++	    ((char *)name->value)[name->length] = 0;
++	    return GSS_S_COMPLETE;
++	}
++#endif
+ 	tok=ename->value;
+ 
+ 	/*
-- 
cgit v1.2.3