From: Ezra Peisach <epeisach@mit.edu>
Date: Fri, 8 Jun 2001 15:57:43 +0000 (+0000)
Subject: 	* svr_principal.c (check_pw_reuse): Cleanup assignment in conditional
X-Git-Tag: krb5-1.3-alpha1~1453
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=10fb0ed69212f625ee9519e83b4314a50f18c2f4;p=krb5.git

	* 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 ae70162cf..9c87ae5fc 100644
--- 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 4481571a6..7552993b1 100644
--- 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++) {