diff options
| author | Tom Yu <tlyu@mit.edu> | 1998-09-25 23:48:12 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1998-09-25 23:48:12 +0000 |
| commit | e75d79d5a37c7711c30bdd25f1c17e2fdd440672 (patch) | |
| tree | d644e22217a44d7708c67532b70f55a2ed52e0bb | |
| parent | 1cec03ce16b282341ae31e9cad708b1221e6662d (diff) | |
| download | krb5-e75d79d5a37c7711c30bdd25f1c17e2fdd440672.zip krb5-e75d79d5a37c7711c30bdd25f1c17e2fdd440672.tar.gz krb5-e75d79d5a37c7711c30bdd25f1c17e2fdd440672.tar.bz2 | |
* kerberos_v4.c (check_princ): Re-order if statements that check
for null keys to make Purify shut up.
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/marc-3des@10938 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/kdc/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kdc/kerberos_v4.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 4bdf99a..f338b92 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 25 19:47:26 1998 Tom Yu <tlyu@mit.edu> + + * kerberos_v4.c (check_princ): Re-order if statements that check + for null keys to make Purify shut up. + Thu Sep 17 18:21:51 1998 Tom Yu <tlyu@mit.edu> * kdc_util.c (kdc_get_server_key): Fix to not use cached tgs key diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c index 2bc3e8c..a1efd8b 100644 --- a/src/kdc/kerberos_v4.c +++ b/src/kdc/kerberos_v4.c @@ -1065,8 +1065,8 @@ check_princ(p_name, instance, lifetime, p, k5key, issrv) } /* If the user's key is null, we want to return an error */ - if ((p->key_low == 0) && (p->key_high == 0)) { - if (k5key->contents != NULL && K4KDC_ENCTYPE_OK(k5key->enctype)) { + if (k5key->contents != NULL && K4KDC_ENCTYPE_OK(k5key->enctype)) { + if ((p->key_low == 0) && (p->key_high == 0)) { /* User has a null key */ lt = klog(L_ERR_NKY, "Null key \"%s\" \"%s\"", p_name, instance, 0); |