rpms/krb5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

For completeness, also initialize an unused field

Browse Source
This commit is contained in:
Nalin Dahyabhai 2013-12-18 18:00:28 -05:00
parent 82c5b9f9b2
commit 9f2cb9776b
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
krb5-1.12-copy_context.patch
View File

@ -1,5 +1,5 @@
Adjusted for 1.12, which still have vtbl and locate_fptrs fields, and drop the Adjusted for 1.12, which still had vtbl, locate_fptrs, and (vestigial)
hunk that touched .gitignore. profile_in_memory fields, and drop the hunk that touched .gitignore.
commit c452644d91d57d8b05ef396a029e34d0c7a48920 commit c452644d91d57d8b05ef396a029e34d0c7a48920
Author: Greg Hudson <ghudson@mit.edu> Author: Greg Hudson <ghudson@mit.edu>
@ -22,7 +22,7 @@ diff --git a/src/lib/krb5/krb/copy_ctx.c b/src/lib/krb5/krb/copy_ctx.c
index 0bc92f8..4237023 100644 index 0bc92f8..4237023 100644
--- a/src/lib/krb5/krb/copy_ctx.c --- a/src/lib/krb5/krb/copy_ctx.c
+++ b/src/lib/krb5/krb/copy_ctx.c +++ b/src/lib/krb5/krb/copy_ctx.c
@@ -77,13 +77,22 @@ krb5_copy_context(krb5_context ctx, krb5_context *nctx_out) @@ -77,13 +77,26 @@ krb5_copy_context(krb5_context ctx, krb5_context *nctx_out)
nctx->ser_ctx_count = 0; nctx->ser_ctx_count = 0;
nctx->ser_ctx = NULL; nctx->ser_ctx = NULL;
nctx->prompt_types = NULL; nctx->prompt_types = NULL;
@ -36,6 +36,10 @@ index 0bc92f8..4237023 100644
+ nctx->plugin_base_dir = NULL; + nctx->plugin_base_dir = NULL;
nctx->os_context.default_ccname = NULL; nctx->os_context.default_ccname = NULL;
+#ifdef KRB5_DNS_LOOKUP
+ nctx->profile_in_memory = 0;
+#endif /* KRB5_DNS_LOOKUP */
+
memset(&nctx->libkrb5_plugins, 0, sizeof(nctx->libkrb5_plugins)); memset(&nctx->libkrb5_plugins, 0, sizeof(nctx->libkrb5_plugins));
nctx->vtbl = NULL; nctx->vtbl = NULL;
nctx->locate_fptrs = NULL; nctx->locate_fptrs = NULL;

5
krb5.spec
View File

@ -41,7 +41,7 @@
Summary: The Kerberos network authentication system Summary: The Kerberos network authentication system
Name: krb5 Name: krb5
Version: 1.12 Version: 1.12
Release: 3%{?dist} Release: 4%{?dist}
# Maybe we should explode from the now-available-to-everybody tarball instead? # Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.12/krb5-1.12-signed.tar # http://web.mit.edu/kerberos/dist/krb5/1.12/krb5-1.12-signed.tar
Source0: krb5-%{version}.tar.gz Source0: krb5-%{version}.tar.gz
@ -964,6 +964,9 @@ exit 0
%{_sbindir}/uuserver %{_sbindir}/uuserver
%changelog %changelog
* Wed Dec 18 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.12-4
- revise previous patch to initialize one more element
* Wed Dec 18 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.12-3 * Wed Dec 18 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.12-3
- backport fixes to krb5_copy_context (RT#7807, #1044735/#1044739) - backport fixes to krb5_copy_context (RT#7807, #1044735/#1044739)