libwbclient: Remove some pointless BAIL_ON_WBC_ERROR macro calls

[ira/wip.git] / nsswitch / libwbclient / wbc_pam.c

diff --git a/nsswitch/libwbclient/wbc_pam.c b/nsswitch/libwbclient/wbc_pam.c
index f9e1e3848a5a38c1f5729a666ed597b17bd57447..30325c85c26f1abf01e6271d31415fd94e318d17 100644 (file)
--- 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;
        }