diff options
| author | Sam Hartman <hartmans@mit.edu> | 2009-04-04 03:03:04 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2009-04-04 03:03:04 +0000 |
| commit | f7c71ff3c2d543986e3a9dbb881fcece4feefd3b (patch) | |
| tree | 01e25747a546239ab05b343f37a104acb6873cec /src | |
| parent | 65e068c918ebdac4b01e25531fa87eff50afbdd0 (diff) | |
| download | krb5-f7c71ff3c2d543986e3a9dbb881fcece4feefd3b.tar.gz krb5-f7c71ff3c2d543986e3a9dbb881fcece4feefd3b.tar.xz krb5-f7c71ff3c2d543986e3a9dbb881fcece4feefd3b.zip | |
fix logic errors
ticket: 6436
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22170 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kdc/fast_util.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/krb/get_in_tkt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/kdc/fast_util.c b/src/kdc/fast_util.c index ac6aa22c4..6ced4c7e6 100644 --- a/src/kdc/fast_util.c +++ b/src/kdc/fast_util.c @@ -211,7 +211,7 @@ krb5_error_code kdc_find_fast else cookie_padata = find_pa_data(request->padata, KRB5_PADATA_FX_COOKIE); if (retval == 0 && cookie_padata != NULL) { krb5_pa_data *new_padata = malloc(sizeof (krb5_pa_data)); - if (new_padata != NULL) { + if (new_padata == NULL) { retval = ENOMEM; } else { new_padata->pa_type = KRB5_PADATA_FX_COOKIE; diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 2944652ff..e6c4434c2 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -1472,7 +1472,7 @@ krb5_get_init_creds(krb5_context context, if (ret) goto cleanup; if ((ret = decrypt_as_reply(context, NULL, local_as_reply, NULL, - NULL, &as_key, krb5_kdc_rep_decrypt_proc, + NULL, &encrypting_key, krb5_kdc_rep_decrypt_proc, NULL))) goto cleanup; } |