summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@fedoraproject.org>2010-03-11 19:20:22 +0000
committerNalin Dahyabhai <nalin@fedoraproject.org>2010-03-11 19:20:22 +0000
commite03499409aaa52b603936a91552f73d2c0c453d3 (patch)
treed5445c6e2573de6c263c9b140a3ce271bfe75668
parentfde0ac5843614a8f21619ec2c386bfddaf3cdaa1 (diff)
downloadkrb5-e03499409aaa52b603936a91552f73d2c0c453d3.tar.gz
krb5-e03499409aaa52b603936a91552f73d2c0c453d3.tar.xz
krb5-e03499409aaa52b603936a91552f73d2c0c453d3.zip
- drop this; it's not sufficient any more anyway
-rw-r--r--krb5-1.3.2-efence.patch25
-rw-r--r--krb5.spec3
2 files changed, 0 insertions, 28 deletions
diff --git a/krb5-1.3.2-efence.patch b/krb5-1.3.2-efence.patch
deleted file mode 100644
index 7c2eeb2..0000000
--- a/krb5-1.3.2-efence.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Avoid tripping ElectricFence. Purely for debugging.
-
---- krb5/src/lib/krb5/krb/init_ctx.c 2004-03-09 19:06:49.000000000 -0500
-+++ krb5/src/lib/krb5/krb/init_ctx.c 2004-03-09 19:09:58.000000000 -0500
-@@ -148,11 +148,15 @@
- if ((retval = krb5_set_default_tgs_ktypes(ctx, NULL)))
- goto cleanup;
-
-- ctx->conf_tgs_ktypes = calloc(ctx->tgs_ktype_count, sizeof(krb5_enctype));
-- if (ctx->conf_tgs_ktypes == NULL && ctx->tgs_ktype_count != 0)
-- goto cleanup;
-- memcpy(ctx->conf_tgs_ktypes, ctx->tgs_ktypes,
-- sizeof(krb5_enctype) * ctx->tgs_ktype_count);
-+ if (ctx->tgs_ktype_count > 0) {
-+ ctx->conf_tgs_ktypes = calloc(ctx->tgs_ktype_count, sizeof(krb5_enctype));
-+ if (ctx->conf_tgs_ktypes == NULL)
-+ goto cleanup;
-+ memcpy(ctx->conf_tgs_ktypes, ctx->tgs_ktypes,
-+ sizeof(krb5_enctype) * ctx->tgs_ktype_count);
-+ } else {
-+ ctx->conf_tgs_ktypes = NULL;
-+ }
- ctx->conf_tgs_ktypes_count = ctx->tgs_ktype_count;
-
- if ((retval = krb5_os_init_context(ctx)))
diff --git a/krb5.spec b/krb5.spec
index dbcca79..92275bf 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -64,7 +64,6 @@ Patch12: krb5-1.7-ktany.patch
Patch14: krb5-1.3-ftp-glob.patch
Patch16: krb5-1.7-buildconf.patch
Patch23: krb5-1.3.1-dns.patch
-Patch26: krb5-1.3.2-efence.patch
Patch29: krb5-1.8-kprop-mktemp.patch
Patch30: krb5-1.3.4-send-pr-tempfile.patch
Patch33: krb5-appl-1.0-io.patch
@@ -260,8 +259,6 @@ pushd krb5-appl-%{appl_version}
popd
%patch16 -p1 -b .buildconf
%patch23 -p1 -b .dns
-# Removes a malloc(0) case, nothing more.
-# %patch26 -p1 -b .efence
%patch29 -p1 -b .kprop-mktemp
%patch30 -p1 -b .send-pr-tempfile
pushd krb5-appl-%{appl_version}