diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2011-03-04 12:09:36 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-03-04 12:15:38 +0000 |
commit | b386077cdc228e9379c259ee16b72a274d2f70d4 (patch) | |
tree | 0074d86bc4e07485d1613674257349af0782febf /main | |
parent | ba7a48af9f538f6b5ebd8c8039a5a92804236587 (diff) | |
download | aports-b386077cdc228e9379c259ee16b72a274d2f70d4.tar.bz2 aports-b386077cdc228e9379c259ee16b72a274d2f70d4.tar.xz |
main/heimdal: remove unused patches
Diffstat (limited to 'main')
-rw-r--r-- | main/heimdal/heimdal-locate_plugin-header.patch | 12 | ||||
-rw-r--r-- | main/heimdal/return-invalid-enctype-for-weak-crypto.patch | 48 |
2 files changed, 0 insertions, 60 deletions
diff --git a/main/heimdal/heimdal-locate_plugin-header.patch b/main/heimdal/heimdal-locate_plugin-header.patch deleted file mode 100644 index 080fa556a..000000000 --- a/main/heimdal/heimdal-locate_plugin-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur heimdal-1.3.1-old/lib/krb5/locate_plugin.h heimdal-1.3.1/lib/krb5/locate_plugin.h ---- heimdal-1.3.1-old/lib/krb5/locate_plugin.h 2009-11-22 01:41:51.000000000 +1000 -+++ heimdal-1.3.1/lib/krb5/locate_plugin.h 2009-11-25 15:04:30.000000000 +1000 -@@ -36,6 +36,8 @@ - #ifndef HEIMDAL_KRB5_LOCATE_PLUGIN_H - #define HEIMDAL_KRB5_LOCATE_PLUGIN_H 1 - -+#include <krb5.h> -+ - #define KRB5_PLUGIN_LOCATE "service_locator" - - enum locate_service_type { diff --git a/main/heimdal/return-invalid-enctype-for-weak-crypto.patch b/main/heimdal/return-invalid-enctype-for-weak-crypto.patch deleted file mode 100644 index c8ce39fef..000000000 --- a/main/heimdal/return-invalid-enctype-for-weak-crypto.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/lib/krb5/context.c -+++ b/lib/krb5/context.c -@@ -825,23 +825,33 @@ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL - krb5_set_default_in_tkt_etypes(krb5_context context, - const krb5_enctype *etypes) - { -+ krb5_error_code ret; - krb5_enctype *p = NULL; -- int i; -+ unsigned int n, m; - - if(etypes) { -- for (i = 0; etypes[i]; ++i) { -- krb5_error_code ret; -- ret = krb5_enctype_valid(context, etypes[i]); -- if (ret) -- return ret; -- } -- ++i; -- ALLOC(p, i); -+ for (n = 0; etypes[n]; n++) -+ ; -+ n++; -+ ALLOC(p, n); - if(!p) { -- krb5_set_error_message (context, ENOMEM, N_("malloc: out of memory", "")); -+ krb5_set_error_message (context, ENOMEM, -+ N_("malloc: out of memory", "")); - return ENOMEM; - } -- memmove(p, etypes, i * sizeof(krb5_enctype)); -+ for (n = 0, m = 0; etypes[n]; n++) { -+ ret = krb5_enctype_valid(context, etypes[n]); -+ if (ret) -+ continue; -+ p[m++] = etypes[n]; -+ } -+ p[m] = ETYPE_NULL; -+ if (m == 0) { -+ free(p); -+ krb5_set_error_message (context, KRB5_PROG_ETYPE_NOSUPP, -+ N_("no valid enctype set", "")); -+ return KRB5_PROG_ETYPE_NOSUPP; -+ } - } - if(context->etypes) - free(context->etypes); - |