[29924] in CVS-changelog-for-Kerberos-V5
krb5 commit: Remove tautological NULL checks in kdc_j_encode.c
daemon@ATHENA.MIT.EDU (Greg Hudson)
Fri Apr 14 12:14:44 2017
Date: Fri, 14 Apr 2017 12:14:36 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201704141614.v3EGEa2R024209@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/1d8988d6f8fb9f06d1b8c38c85a35b39648d5e42
commit 1d8988d6f8fb9f06d1b8c38c85a35b39648d5e42
Author: Robbie Harwood <rharwood@redhat.com>
Date: Mon Apr 10 13:06:25 2017 -0400
Remove tautological NULL checks in kdc_j_encode.c
src/plugins/audit/kdc_j_encode.c | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/plugins/audit/kdc_j_encode.c b/src/plugins/audit/kdc_j_encode.c
index e24f4d8..265e95b 100755
--- a/src/plugins/audit/kdc_j_encode.c
+++ b/src/plugins/audit/kdc_j_encode.c
@@ -861,22 +861,19 @@ tkt_to_value(krb5_ticket *tkt, k5_json_object obj,
ret = int32_to_value(part2->session->enctype, tmp, AU_SESS_ETYPE);
if (ret)
goto error;
- if (&part2->times) {
- ret = int32_to_value(part2->times.starttime, tmp, AU_START);
- if (ret)
- goto error;
- ret = int32_to_value(part2->times.endtime, tmp, AU_END);
- if (ret)
- goto error;
- ret = int32_to_value(part2->times.renew_till, tmp, AU_RENEW_TILL);
- if (ret)
- goto error;
- ret = int32_to_value(part2->times.authtime, tmp, AU_AUTHTIME);
- if (ret)
- goto error;
- }
- if (&part2->transited && &part2->transited.tr_contents &&
- part2->transited.tr_contents.length > 0) {
+ ret = int32_to_value(part2->times.starttime, tmp, AU_START);
+ if (ret)
+ goto error;
+ ret = int32_to_value(part2->times.endtime, tmp, AU_END);
+ if (ret)
+ goto error;
+ ret = int32_to_value(part2->times.renew_till, tmp, AU_RENEW_TILL);
+ if (ret)
+ goto error;
+ ret = int32_to_value(part2->times.authtime, tmp, AU_AUTHTIME);
+ if (ret)
+ goto error;
+ if (part2->transited.tr_contents.length > 0) {
ret = data_to_value(&part2->transited.tr_contents,
tmp, AU_TR_CONTENTS);
if (ret)
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
