s3/s4 - Adapt the IDL changes on various locations

[samba.git] / source4 / kdc / kpasswdd.c

diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index 9664d1b016feb10f5b5dfd4efd35cbb21da9b8b6..f9bd683e888d445466e60045a83fc848a5e1786f 100644 (file)
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -113,7 +113,7 @@ static bool kpasswdd_make_unauth_error_reply(struct kdc_server *kdc,
 static bool kpasswd_make_pwchange_reply(struct kdc_server *kdc, 
                                        TALLOC_CTX *mem_ctx, 
                                        NTSTATUS status, 
-                                       enum samr_RejectReason reject_reason,
+                                       enum samPwdChangeReason reject_reason,
                                        struct samr_DomInfo1 *dominfo,
                                        DATA_BLOB *error_blob) 
 {
@@ -132,17 +132,16 @@ static bool kpasswd_make_pwchange_reply(struct kdc_server *kdc,
        if (dominfo && NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION)) {
                const char *reject_string;
                switch (reject_reason) {
-               case SAMR_REJECT_TOO_SHORT:
+               case SAM_PWD_CHANGE_PASSWORD_TOO_SHORT:
                        reject_string = talloc_asprintf(mem_ctx, "Password too short, password must be at least %d characters long",
                                                        dominfo->min_password_length);
                        break;
-               case SAMR_REJECT_COMPLEXITY:
+               case SAM_PWD_CHANGE_NOT_COMPLEX:
                        reject_string = "Password does not meet complexity requirements";
                        break;
-               case SAMR_REJECT_IN_HISTORY:
+               case SAM_PWD_CHANGE_PWD_IN_HISTORY:
                        reject_string = "Password is already in password history";
                        break;
-               case SAMR_REJECT_OTHER:
                default:
                        reject_string = talloc_asprintf(mem_ctx, "Password must be at least %d characters long, and cannot match any of your %d previous passwords",
                                                        dominfo->min_password_length, dominfo->password_history_length);
@@ -178,7 +177,7 @@ static bool kpasswdd_change_password(struct kdc_server *kdc,
                                     DATA_BLOB *reply)
 {
        NTSTATUS status;
-       enum samr_RejectReason reject_reason;
+       enum samPwdChangeReason reject_reason;
        struct samr_DomInfo1 *dominfo;
        struct ldb_context *samdb;
 
@@ -248,7 +247,7 @@ static bool kpasswd_process_request(struct kdc_server *kdc,
        case KRB5_KPASSWD_VERS_SETPW:
        {
                NTSTATUS status;
-               enum samr_RejectReason reject_reason = SAMR_REJECT_OTHER;
+               enum samPwdChangeReason reject_reason = SAM_PWD_CHANGE_NO_ERROR;
                struct samr_DomInfo1 *dominfo = NULL;
                struct ldb_context *samdb;
                struct ldb_message *msg;
@@ -349,7 +348,7 @@ static bool kpasswd_process_request(struct kdc_server *kdc,
                        status = NT_STATUS_TRANSACTION_ABORTED;
                        return kpasswd_make_pwchange_reply(kdc, mem_ctx, 
                                                           status,
-                                                          SAMR_REJECT_OTHER, 
+                                                          SAM_PWD_CHANGE_NO_ERROR,
                                                           NULL, 
                                                           reply);
                }
@@ -362,7 +361,7 @@ static bool kpasswd_process_request(struct kdc_server *kdc,
                        ldb_transaction_cancel(samdb);
                        return kpasswd_make_pwchange_reply(kdc, mem_ctx, 
                                                           status,
-                                                          SAMR_REJECT_OTHER, 
+                                                          SAM_PWD_CHANGE_NO_ERROR,
                                                           NULL, 
                                                           reply);
                }