* 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

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 4bdf99afd24d63c10e3eb9717b294bb83ae4cf90..f338b92bde28661f61fa31d55dea55a0eebb2d60 100644 (file)
--- 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 2bc3e8ced59a0d412b3a97fbce8873146e24a1be..a1efd8b3759b9165324588a45f5badfed5459d51 100644 (file)
--- 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);