diff options
| author | Volker Lendecke <vl@samba.org> | 2010-04-20 16:07:13 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-04-23 23:41:04 +0200 |
| commit | 7574347e68b258456179614d65ecb5549dfe97a5 (patch) | |
| tree | de15934a781fc6e7800d84d1816105d0a3d37596 /nsswitch | |
| parent | f2f0fed8aad21e09837f256e00bb38f33dc73e44 (diff) | |
| download | samba-7574347e68b258456179614d65ecb5549dfe97a5.tar.gz samba-7574347e68b258456179614d65ecb5549dfe97a5.tar.bz2 samba-7574347e68b258456179614d65ecb5549dfe97a5.zip | |
libwbclient: Remove some pointless BAIL_ON_WBC_ERROR macro calls
Diffstat (limited to 'nsswitch')
| -rw-r--r-- | nsswitch/libwbclient/wbc_pam.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/nsswitch/libwbclient/wbc_pam.c b/nsswitch/libwbclient/wbc_pam.c index f9e1e3848a..30325c85c2 100644 --- a/nsswitch/libwbclient/wbc_pam.c +++ b/nsswitch/libwbclient/wbc_pam.c @@ -791,7 +791,7 @@ wbcErr wbcChangeUserPasswordEx(const struct wbcChangePasswordParams *params, if (!params->account_name) { wbc_status = WBC_ERR_INVALID_PARAM; - BAIL_ON_WBC_ERROR(wbc_status); + goto done; } if (error) { @@ -815,7 +815,7 @@ wbcErr wbcChangeUserPasswordEx(const struct wbcChangePasswordParams *params, if (!params->account_name) { wbc_status = WBC_ERR_INVALID_PARAM; - BAIL_ON_WBC_ERROR(wbc_status); + goto done; } strncpy(request.data.chauthtok.user, params->account_name, @@ -839,55 +839,55 @@ wbcErr wbcChangeUserPasswordEx(const struct wbcChangePasswordParams *params, if (!params->account_name || !params->domain_name) { wbc_status = WBC_ERR_INVALID_PARAM; - BAIL_ON_WBC_ERROR(wbc_status); + goto done; } if (params->old_password.response.old_lm_hash_enc_length && !params->old_password.response.old_lm_hash_enc_data) { wbc_status = WBC_ERR_INVALID_PARAM; - BAIL_ON_WBC_ERROR(wbc_status); + goto done; } if (params->old_password.response.old_lm_hash_enc_length == 0 && params->old_password.response.old_lm_hash_enc_data) { wbc_status = WBC_ERR_INVALID_PARAM; - BAIL_ON_WBC_ERROR(wbc_status); + goto done; } if (params->old_password.response.old_nt_hash_enc_length && !params->old_password.response.old_nt_hash_enc_data) { wbc_status = WBC_ERR_INVALID_PARAM; - BAIL_ON_WBC_ERROR(wbc_status); + goto done; } if (params->old_password.response.old_nt_hash_enc_length == 0 && params->old_password.response.old_nt_hash_enc_data) { wbc_status = WBC_ERR_INVALID_PARAM; - BAIL_ON_WBC_ERROR(wbc_status); + goto done; } if (params->new_password.response.lm_length && !params->new_password.response.lm_data) { wbc_status = WBC_ERR_INVALID_PARAM; - BAIL_ON_WBC_ERROR(wbc_status); + goto done; } if (params->new_password.response.lm_length == 0 && params->new_password.response.lm_data) { wbc_status = WBC_ERR_INVALID_PARAM; - BAIL_ON_WBC_ERROR(wbc_status); + goto done; } if (params->new_password.response.nt_length && !params->new_password.response.nt_data) { wbc_status = WBC_ERR_INVALID_PARAM; - BAIL_ON_WBC_ERROR(wbc_status); + goto done; } if (params->new_password.response.nt_length == 0 && params->new_password.response.nt_data) { wbc_status = WBC_ERR_INVALID_PARAM; - BAIL_ON_WBC_ERROR(wbc_status); + goto done; } strncpy(request.data.chng_pswd_auth_crap.user, @@ -933,7 +933,7 @@ wbcErr wbcChangeUserPasswordEx(const struct wbcChangePasswordParams *params, break; default: wbc_status = WBC_ERR_INVALID_PARAM; - BAIL_ON_WBC_ERROR(wbc_status); + goto done; break; } |