diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2013-12-18 18:00:28 -0500 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2013-12-18 18:01:30 -0500 |
| commit | 9f2cb9776b2e1f69529784d1dd0f07e0ece4e72d (patch) | |
| tree | f86d9c00c109510531ce81d5e7f976e169e634df | |
| parent | 82c5b9f9b2b638bd04c8062c4113a4479640af81 (diff) | |
For completeness, also initialize an unused fieldkrb5-1.12-4.fc21
| -rw-r--r-- | krb5-1.12-copy_context.patch | 10 | ||||
| -rw-r--r-- | krb5.spec | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/krb5-1.12-copy_context.patch b/krb5-1.12-copy_context.patch index dde811f..54b477e 100644 --- a/krb5-1.12-copy_context.patch +++ b/krb5-1.12-copy_context.patch @@ -1,5 +1,5 @@ -Adjusted for 1.12, which still have vtbl and locate_fptrs fields, and drop the -hunk that touched .gitignore. +Adjusted for 1.12, which still had vtbl, locate_fptrs, and (vestigial) +profile_in_memory fields, and drop the hunk that touched .gitignore. commit c452644d91d57d8b05ef396a029e34d0c7a48920 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 --- a/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 = NULL; nctx->prompt_types = NULL; @@ -36,6 +36,10 @@ index 0bc92f8..4237023 100644 + nctx->plugin_base_dir = 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)); nctx->vtbl = NULL; nctx->locate_fptrs = NULL; @@ -41,7 +41,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.12 -Release: 3%{?dist} +Release: 4%{?dist} # 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 Source0: krb5-%{version}.tar.gz @@ -964,6 +964,9 @@ exit 0 %{_sbindir}/uuserver %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 - backport fixes to krb5_copy_context (RT#7807, #1044735/#1044739) |