Attachment #169898 for bug #204185

Lines 2-9 Link Here

(-)Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= kerberos	4	PORTNAME= kerberos
5	PORTVERSION= 1.1.1	5	PORTVERSION= 1.2.4
6	PORTREVISION= 2
7	CATEGORIES= security python	6	CATEGORIES= security python
8	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 32-38 Link Here
32	GSSAPI_HEIMDAL_EXTRA_PATCHES= ${GSSAPI_BASE_EXTRA_PATCHES}	31	GSSAPI_HEIMDAL_EXTRA_PATCHES= ${GSSAPI_BASE_EXTRA_PATCHES}
33		32
34	post-patch:	33	post-patch:
35	@${REINPLACE_CMD} -e 's\|commands.getoutput("krb5-config\|commands.getoutput("${GSSAPIBASEDIR}/bin/krb5-config\|g' ${WRKSRC}/setup.py	34	@${REINPLACE_CMD} -e 's\|getoutput("krb5-config\|getoutput("${GSSAPIBASEDIR}/bin/krb5-config\|g' ${WRKSRC}/setup.py
36		35
37	post-install:	36	post-install:
38	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/kerberos.so	37	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/kerberos.so

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (kerberos-1.1.1.tar.gz) = 09132e3b2027854e8714894546aff11f31e6051eb75513e774948e10a5dde6f5	1	SHA256 (kerberos-1.2.4.tar.gz) = d6f49923bbcf4ebc47ae47b7ceac7866543200669e1dfb24821221da3e940987
2	SIZE (kerberos-1.1.1.tar.gz) = 15343	2	SIZE (kerberos-1.2.4.tar.gz) = 19615




--- src/kerberosgss.c.orig	2016-01-25 17:51:33 UTC
+++ src/kerberosgss.c
@@ -43,7 +43,7 @@ char* server_principal_details(const cha
     int code;
     krb5_context kcontext;
     krb5_keytab kt = NULL;

     krb5_keytab_entry entry;
     char* pname = NULL;
     
@@ -98,13 +98,13 @@ char* server_principal_details(const cha
                 goto end;
             }
             strcpy(result, pname);
-            krb5_free_unparsed_name(kcontext, pname);
-            krb5_free_keytab_entry_contents(kcontext, &entry);

+        krb5_kt_free_entry(kcontext, &entry);
     }
     
     if (result == NULL) {
@@ -115,9 +115,7 @@ char* server_principal_details(const cha
     }
     
 end:
-    if (cursor) {
-        krb5_kt_end_seq_get(kcontext, kt, &cursor);
-    }
+    krb5_kt_end_seq_get(kcontext, kt, &cursor);
     if (kt) {
         krb5_kt_close(kcontext, kt);
     }

Return to bug 204185

Lines 1-6 Link Here

(-)files/extra-patch-src_kerberosgss.c (-10 / +11 lines)
1	--- src/kerberosgss.c.orig 2015-03-29 03:40:20 UTC	1	--- src/kerberosgss.c.orig 2016-01-25 17:51:33 UTC
2	+++ src/kerberosgss.c	2	+++ src/kerberosgss.c
3	@@ -38,7 +38,7 @@ char* server_principal_details(const cha	3	@@ -43,7 +43,7 @@ char* server_principal_details(const cha
4	int code;	4	int code;
5	krb5_context kcontext;	5	krb5_context kcontext;
6	krb5_keytab kt = NULL;	6	krb5_keytab kt = NULL;
Lines 9-17 Link Here
9	krb5_keytab_entry entry;	9	krb5_keytab_entry entry;
10	char* pname = NULL;	10	char* pname = NULL;
11		11
12	@@ -81,13 +81,13 @@ char* server_principal_details(const cha	12	@@ -98,13 +98,13 @@ char* server_principal_details(const cha
13	{	13	goto end;
14	result = malloc(strlen(pname) + 1);	14	}
15	strcpy(result, pname);	15	strcpy(result, pname);
16	- krb5_free_unparsed_name(kcontext, pname);	16	- krb5_free_unparsed_name(kcontext, pname);
17	- krb5_free_keytab_entry_contents(kcontext, &entry);	17	- krb5_free_keytab_entry_contents(kcontext, &entry);
Lines 26-39 Link Here
26	+ krb5_kt_free_entry(kcontext, &entry);	26	+ krb5_kt_free_entry(kcontext, &entry);
27	}	27	}
28		28
29	if (result == NULL)	29	if (result == NULL) {
30	@@ -97,8 +97,7 @@ char* server_principal_details(const cha	30	@@ -115,9 +115,7 @@ char* server_principal_details(const cha
31	}	31	}
32		32
33	end:	33	end:
34	- if (cursor)	34	- if (cursor) {
35	- krb5_kt_end_seq_get(kcontext, kt, &cursor);	35	- krb5_kt_end_seq_get(kcontext, kt, &cursor);
		36	- }
36	+ krb5_kt_end_seq_get(kcontext, kt, &cursor);	37	+ krb5_kt_end_seq_get(kcontext, kt, &cursor);
37	if (kt)	38	if (kt) {
38	krb5_kt_close(kcontext, kt);	39	krb5_kt_close(kcontext, kt);
39	krb5_free_context(kcontext);	40	}