diff options
| author | Robbie Harwood <rharwood@redhat.com> | 2017-04-10 13:06:25 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2017-04-14 12:02:56 -0400 |
| commit | 1d8988d6f8fb9f06d1b8c38c85a35b39648d5e42 (patch) | |
| tree | 7e9bb1c28f98c3111c5ed2e91e39abc7d6c88fd4 /src | |
| parent | e6502586d5714e0d61ae190309843aa6637a84ca (diff) | |
| download | krb5-1d8988d6f8fb9f06d1b8c38c85a35b39648d5e42.zip krb5-1d8988d6f8fb9f06d1b8c38c85a35b39648d5e42.tar.gz krb5-1d8988d6f8fb9f06d1b8c38c85a35b39648d5e42.tar.bz2 | |
Remove tautological NULL checks in kdc_j_encode.c
Diffstat (limited to 'src')
| -rwxr-xr-x | 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) |