diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-07-05 05:05:13 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-07-05 05:05:13 -0400 |
| commit | 0d6d2ab3b229f1ddddc60ea01429ae2768f85a34 (patch) | |
| tree | 69858c315eb47a3ead1be3c3839fb65b65888ba9 /src/plugins | |
| parent | 174a452878ef5356f5baa3865a2e219a0dad01a0 (diff) | |
| download | krb5-0d6d2ab3b229f1ddddc60ea01429ae2768f85a34.tar.gz krb5-0d6d2ab3b229f1ddddc60ea01429ae2768f85a34.tar.xz krb5-0d6d2ab3b229f1ddddc60ea01429ae2768f85a34.zip | |
Simplify pkinit_server_verify_padata slightly
Eliminate the effectively unused variable tmp_as_req, and eliminate
two unnecessary conditionals for freeing pointers.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_srv.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c index 8050565d1..00d4126a7 100644 --- a/src/plugins/preauth/pkinit/pkinit_srv.c +++ b/src/plugins/preauth/pkinit/pkinit_srv.c @@ -299,7 +299,6 @@ pkinit_server_verify_padata(krb5_context context, krb5_checksum cksum = {0, 0, 0, NULL}; krb5_data *der_req = NULL; int valid_eku = 0, valid_san = 0; - krb5_kdc_req *tmp_as_req = NULL; krb5_data k5data; int is_signed = 1; krb5_pa_data **e_data = NULL; @@ -548,16 +547,12 @@ cleanup: case KRB5_PADATA_PK_AS_REQ_OLD: free_krb5_pa_pk_as_req_draft9(&reqp9); } - if (tmp_as_req != NULL) - k5int_krb5_free_kdc_req(context, tmp_as_req); free(authp_data.data); free(krb5_authz.data); if (reqctx != NULL) pkinit_fini_kdc_req_context(context, reqctx); - if (auth_pack != NULL) - free_krb5_auth_pack(&auth_pack); - if (auth_pack9 != NULL) - free_krb5_auth_pack_draft9(context, &auth_pack9); + free_krb5_auth_pack(&auth_pack); + free_krb5_auth_pack_draft9(context, &auth_pack9); (*respond)(arg, retval, modreq, e_data, NULL); } |