diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-06-08 15:57:43 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-06-08 15:57:43 +0000 |
| commit | 10fb0ed69212f625ee9519e83b4314a50f18c2f4 (patch) | |
| tree | 741f19c1907540ed7e1a10a7b8c7353e7fcc63d6 /src | |
| parent | 7d671504192ddcd7006ba9636d9334bcc744bdbc (diff) | |
| download | krb5-10fb0ed69212f625ee9519e83b4314a50f18c2f4.tar.gz krb5-10fb0ed69212f625ee9519e83b4314a50f18c2f4.tar.xz krb5-10fb0ed69212f625ee9519e83b4314a50f18c2f4.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/kadm5/srv/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/svr_principal.c | 9 |
2 files changed, 9 insertions, 4 deletions
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++) { |