diff options
| author | dvl <dvl@FreeBSD.org> | 2018-01-30 10:20:10 +0800 |
|---|---|---|
| committer | dvl <dvl@FreeBSD.org> | 2018-01-30 10:20:10 +0800 |
| commit | c82554d5e936eb6706299bd4643732f9be2b0df8 (patch) | |
| tree | 771d08f4483bb917a86167660bac259b0ac5a68f /security | |
| parent | 27f2b3770a478013f69789ae90a01edbd95f784e (diff) | |
| download | freebsd-ports-gnome-c82554d5e936eb6706299bd4643732f9be2b0df8.tar.gz freebsd-ports-gnome-c82554d5e936eb6706299bd4643732f9be2b0df8.tar.zst freebsd-ports-gnome-c82554d5e936eb6706299bd4643732f9be2b0df8.zip | |
Fix for use with either GSSAPI_BASE or GSSAPI_HEIMDAL
Without, the first invocation of authGSSClientStep raises kerberos.GSSError
after failing to acquire a ticket for the krbtgt service on the intended host
rather than the specified service.
PR: 204899
Submitted by: John W. O'Brien <john@saltant.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/py-kerberos/Makefile | 1 | ||||
| -rw-r--r-- | security/py-kerberos/files/extra-patch-src_kerberosgss.c | 9 | ||||
| -rw-r--r-- | security/py-kerberos/files/extra-patch-src_kerberosgss.h | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/security/py-kerberos/Makefile b/security/py-kerberos/Makefile index fd0cae95ae81..eab2e42c1873 100644 --- a/security/py-kerberos/Makefile +++ b/security/py-kerberos/Makefile @@ -3,6 +3,7 @@ PORTNAME= kerberos PORTVERSION= 1.2.5 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-kerberos/files/extra-patch-src_kerberosgss.c b/security/py-kerberos/files/extra-patch-src_kerberosgss.c index 0b9e4f7d78ab..4ab02b2f5b49 100644 --- a/security/py-kerberos/files/extra-patch-src_kerberosgss.c +++ b/security/py-kerberos/files/extra-patch-src_kerberosgss.c @@ -38,3 +38,12 @@ if (kt) { krb5_kt_close(kcontext, kt); } +@@ -150,7 +148,7 @@ int authenticate_gss_client_init( + name_token.value = (char *)service; + + maj_stat = gss_import_name( +- &min_stat, &name_token, gss_krb5_nt_service_name, &state->server_name ++ &min_stat, &name_token, GSS_C_NT_HOSTBASED_SERVICE, &state->server_name + ); + + if (GSS_ERROR(maj_stat)) { diff --git a/security/py-kerberos/files/extra-patch-src_kerberosgss.h b/security/py-kerberos/files/extra-patch-src_kerberosgss.h index b4f162c2982b..806652650389 100644 --- a/security/py-kerberos/files/extra-patch-src_kerberosgss.h +++ b/security/py-kerberos/files/extra-patch-src_kerberosgss.h @@ -1,11 +1,10 @@ --- src/kerberosgss.h.orig 2015-03-29 03:41:32 UTC +++ src/kerberosgss.h -@@ -14,8 +14,9 @@ +@@ -14,8 +14,8 @@ * limitations under the License. **/ +#include <krb5.h> -+#define gss_krb5_nt_service_name GSS_KRB5_NT_PRINCIPAL_NAME #include <gssapi/gssapi.h> -#include <gssapi/gssapi_generic.h> #include <gssapi/gssapi_krb5.h> |