diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-06-04 21:26:34 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-06-04 21:26:34 +0000 |
| commit | 48c955640085b84684d990b07e6496c999e8623f (patch) | |
| tree | 4c7bbfac0550ddc6ae1c80aed79e4e4460637a87 /src/kadmin/server/misc.c | |
| parent | 8ca2bf1ef6ba62ff8a17f119ec237b9b3c5a1771 (diff) | |
| download | krb5-48c955640085b84684d990b07e6496c999e8623f.tar.gz krb5-48c955640085b84684d990b07e6496c999e8623f.tar.xz krb5-48c955640085b84684d990b07e6496c999e8623f.zip | |
* misc.c, schpw.c: Cleanup assignments in conditionals
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13268 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/server/misc.c')
| -rw-r--r-- | src/kadmin/server/misc.c | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/src/kadmin/server/misc.c b/src/kadmin/server/misc.c index 9dc3d9d28..ea0e4ce80 100644 --- a/src/kadmin/server/misc.c +++ b/src/kadmin/server/misc.c @@ -44,13 +44,13 @@ chpass_principal_wrapper(void *server_handle, kadm5_principal_ent_rec princ; kadm5_server_handle_t handle = server_handle; - if (ret = krb5_timeofday(handle->context, &now)) + ret = krb5_timeofday(handle->context, &now); + if (ret) return ret; - if((ret = kadm5_get_principal(handle->lhandle, principal, - &princ, - KADM5_PRINCIPAL_NORMAL_MASK)) != - KADM5_OK) + ret = kadm5_get_principal(handle->lhandle, principal, + &princ, KADM5_PRINCIPAL_NORMAL_MASK); + if(ret != KADM5_OK) return ret; if(princ.aux_attributes & KADM5_POLICY) { if((ret=kadm5_get_policy(handle->lhandle, @@ -64,12 +64,16 @@ chpass_principal_wrapper(void *server_handle, (void) kadm5_free_principal_ent(handle->lhandle, &princ); return KADM5_PASS_TOOSOON; } - if (ret = kadm5_free_policy_ent(handle->lhandle, &pol)) { + + ret = kadm5_free_policy_ent(handle->lhandle, &pol); + if (ret) { (void) kadm5_free_principal_ent(handle->lhandle, &princ); return ret; } } - if (ret = kadm5_free_principal_ent(handle->lhandle, &princ)) + + ret = kadm5_free_principal_ent(handle->lhandle, &princ); + if (ret) return ret; return kadm5_chpass_principal(server_handle, principal, password); @@ -107,13 +111,13 @@ randkey_principal_wrapper(void *server_handle, kadm5_principal_ent_rec princ; kadm5_server_handle_t handle = server_handle; - if (ret = krb5_timeofday(handle->context, &now)) + ret = krb5_timeofday(handle->context, &now); + if (ret) return ret; - if((ret = kadm5_get_principal(handle->lhandle, - principal, &princ, - KADM5_PRINCIPAL_NORMAL_MASK)) != - OSA_ADB_OK) + ret = kadm5_get_principal(handle->lhandle, principal, + &princ, KADM5_PRINCIPAL_NORMAL_MASK); + if(ret != OSA_ADB_OK) return ret; if(princ.aux_attributes & KADM5_POLICY) { if((ret=kadm5_get_policy(handle->lhandle, @@ -127,12 +131,16 @@ randkey_principal_wrapper(void *server_handle, (void) kadm5_free_principal_ent(handle->lhandle, &princ); return KADM5_PASS_TOOSOON; } - if (ret = kadm5_free_policy_ent(handle->lhandle, &pol)) { + + ret = kadm5_free_policy_ent(handle->lhandle, &pol); + if (ret) { (void) kadm5_free_principal_ent(handle->lhandle, &princ); return ret; } } - if (ret = kadm5_free_principal_ent(handle->lhandle, &princ)) + + ret = kadm5_free_principal_ent(handle->lhandle, &princ); + if (ret) return ret; return kadm5_randkey_principal(server_handle, principal, keys, n_keys); } |