* svr_principal.c (check_pw_reuse): Cleanup assignment in conditional

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13309 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index ae70162cfb501b152ef707c53b30e1867b7a4bd5..9c87ae5fcbf1aaee81a6eb77ff36735d03723709 100644 (file)
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-08  Ezra Peisach  <epeisach@mit.edu>
+
+       * svr_principal.c (check_pw_reuse): Cleanup assignment in conditional.
+
 2001-06-04  Ezra Peisach  <epeisach@mit.edu>
 
        * svr_principal.c: Cleanup assignments in conditionals.

diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
index 4481571a6d6cb33c1fce4efab5f438c757418fc5..7552993b10cd9b2f8bdedd34c906670c567d6179 100644 (file)
--- a/src/lib/kadm5/srv/svr_principal.c
+++ b/src/lib/kadm5/srv/svr_principal.c
@@ -861,10 +861,11 @@ check_pw_reuse(krb5_context context,
     krb5_error_code ret;
 
     for (x = 0; x < n_new_key_data; x++) {
-        if (ret = krb5_dbekd_decrypt_key_data(context,
-                                              &master_keyblock,
-                                              &(new_key_data[x]),
-                                              &newkey, NULL))
+       ret = krb5_dbekd_decrypt_key_data(context,
+                                         &master_keyblock,
+                                         &(new_key_data[x]),
+                                         &newkey, NULL);
+       if (ret)
            return(ret);
        for (y = 0; y < n_pw_hist_data; y++) {
             for (z = 0; z < pw_hist_data[y].n_key_data; z++) {