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

Initialize life/rlife in kdcpolicy interface

Browse Source
This commit is contained in:
Robbie Harwood 2019-08-09 16:05:18 -04:00
parent e73c24bb36
commit 6fb26c9d3d
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Initialize-life-rlife-in-kdcpolicy-interface.patch Normal file
View File

@ -0,0 +1,41 @@
From a2065b41a6a89b273b455088a5df5304bfd1f663 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Fri, 9 Aug 2019 14:07:22 -0400
Subject: [PATCH] Initialize life/rlife in kdcpolicy interface
A value of 0 indicates that the plugin doesn't wish to modify lifetimes.
Make this the default, rather than requiring all plugins to set these
values themselves.
ticket: 8824 (new)
tags: pullup
target_version: 1.17-next
target_version: 1.16-next
(cherry picked from commit d81c5870013240c04642c8e0cb994b4c49e40ddf)
---
src/kdc/policy.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/kdc/policy.c b/src/kdc/policy.c
index 26c16f97c..a3ff556c5 100644
--- a/src/kdc/policy.c
+++ b/src/kdc/policy.c
@@ -106,7 +106,7 @@ check_kdcpolicy_as(krb5_context context, const krb5_kdc_req *request,
krb5_data *const *auth_indicators, krb5_timestamp kdc_time,
krb5_ticket_times *times, const char **status)
{
- krb5_deltat life, rlife;
+ krb5_deltat life = 0, rlife = 0;
krb5_error_code ret;
kdcpolicy_handle *hp, h;
char **ais = NULL;
@@ -146,7 +146,7 @@ check_kdcpolicy_tgs(krb5_context context, const krb5_kdc_req *request,
krb5_data *const *auth_indicators, krb5_timestamp kdc_time,
krb5_ticket_times *times, const char **status)
{
- krb5_deltat life, rlife;
+ krb5_deltat life = 0, rlife = 0;
krb5_error_code ret;
kdcpolicy_handle *hp, h;
char **ais = NULL;

6
krb5.spec
View File

@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system
Name: krb5
Version: 1.17
# for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces)
Release: 39%{?dist}
Release: 40%{?dist}
# lookaside-cached sources; two downloads and a build artifact
Source0: https://web.mit.edu/kerberos/dist/krb5/1.17/krb5-%{version}%{prerelease}.tar.gz
@ -118,6 +118,7 @@ Patch155: Use-imported-soft-pkcs11-for-tests.patch
Patch156: Fix-Coverity-defects-in-soft-pkcs11-test-code.patch
Patch157: Skip-URI-tests-when-using-asan.patch
Patch158: Fix-memory-leaks-in-soft-pkcs11-code.patch
Patch159: Initialize-life-rlife-in-kdcpolicy-interface.patch
License: MIT
URL: https://web.mit.edu/kerberos/www/
@ -727,6 +728,9 @@ exit 0
%{_libdir}/libkadm5srv_mit.so.*
%changelog
* Fri Aug 09 2019 Robbie Harwood <rharwood@redhat.com> - 1.17-40
- Initialize life/rlife in kdcpolicy interface
* Tue Aug 06 2019 Robbie Harwood <rharwood@redhat.com> - 1.17-39
- Fix memory leaks in soft-pkcs11 code