- drop this; it's not sufficient any more anyway
This commit is contained in:
parent
fde0ac5843
commit
e03499409a
@ -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)))
|
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user