Fix include paths to new location of libutil.
[bbaumbach/samba-autobuild/.git] / source4 / rpc_server / samr / samr_password.c
index 436a53b7d968830a6f696c1078c82b5eb98e28c4..8a855a7bdba6957b98720cd913cafce9e353f125 100644 (file)
@@ -4,10 +4,11 @@
    samr server password set/change handling
 
    Copyright (C) Andrew Tridgell 2004
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "rpc_server/dcerpc_server.h"
 #include "rpc_server/common/common.h"
 #include "rpc_server/samr/dcesrv_samr.h"
+#include "system/time.h"
+#include "../lib/crypto/crypto.h"
+#include "dsdb/common/flags.h"
+#include "libcli/ldap/ldap.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
+#include "rpc_server/samr/proto.h"
+#include "libcli/auth/libcli_auth.h"
+#include "../lib/util/util_ldb.h"
+#include "param/param.h"
 
 /* 
   samr_ChangePasswordUser 
 */
-NTSTATUS samr_ChangePasswordUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                                struct samr_ChangePasswordUser *r)
+NTSTATUS dcesrv_samr_ChangePasswordUser(struct dcesrv_call_state *dce_call, 
+                                       TALLOC_CTX *mem_ctx,
+                                       struct samr_ChangePasswordUser *r)
 {
        struct dcesrv_handle *h;
        struct samr_account_state *a_state;
-       struct ldb_message **res, mod, *msg;
+       struct ldb_context *sam_ctx;
+       struct ldb_message **res, *msg;
        int ret;
        struct samr_Password new_lmPwdHash, new_ntPwdHash, checkHash;
        struct samr_Password *lm_pwd, *nt_pwd;
        NTSTATUS status = NT_STATUS_OK;
-       const char * const attrs[] = { "lmPwdHash", "ntPwdHash" , "unicodePwd", NULL };
+       const char * const attrs[] = { "dBCSPwd", "unicodePwd" , NULL };
 
-       DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_USER);
+       DCESRV_PULL_HANDLE(h, r->in.user_handle, SAMR_HANDLE_USER);
 
        a_state = h->data;
 
-       /* fetch the old hashes */
-       ret = samdb_search(a_state->sam_ctx, mem_ctx, NULL, &res, attrs,
-                          "dn=%s", a_state->account_dn);
-       if (ret != 1) {
-               return NT_STATUS_INTERNAL_DB_CORRUPTION;
-       }
-       msg = res[0];
-
-       /* basic sanity checking on parameters */
+       /* basic sanity checking on parameters.  Do this before any database ops */
        if (!r->in.lm_present || !r->in.nt_present ||
            !r->in.old_lm_crypted || !r->in.new_lm_crypted ||
            !r->in.old_nt_crypted || !r->in.new_nt_crypted) {
@@ -59,15 +64,31 @@ NTSTATUS samr_ChangePasswordUser(struct dcesrv_call_state *dce_call, TALLOC_CTX
                   present */
                return NT_STATUS_INVALID_PARAMETER_MIX;
        }
-       if (!r->in.cross1_present || !r->in.nt_cross) {
-               return NT_STATUS_NT_CROSS_ENCRYPTION_REQUIRED;
+
+       /* To change a password we need to open as system */
+       sam_ctx = samdb_connect(mem_ctx, dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, system_session(mem_ctx, dce_call->conn->dce_ctx->lp_ctx));
+       if (sam_ctx == NULL) {
+               return NT_STATUS_INVALID_SYSTEM_SERVICE;
        }
-       if (!r->in.cross2_present || !r->in.lm_cross) {
-               return NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED;
+
+       ret = ldb_transaction_start(sam_ctx);
+       if (ret) {
+               DEBUG(1, ("Failed to start transaction: %s\n", ldb_errstring(sam_ctx)));
+               return NT_STATUS_TRANSACTION_ABORTED;
+       }
+
+       /* fetch the old hashes */
+       ret = gendb_search_dn(sam_ctx, mem_ctx,
+                             a_state->account_dn, &res, attrs);
+       if (ret != 1) {
+               ldb_transaction_cancel(sam_ctx);
+               return NT_STATUS_WRONG_PASSWORD;
        }
+       msg = res[0];
 
        status = samdb_result_passwords(mem_ctx, msg, &lm_pwd, &nt_pwd);
        if (!NT_STATUS_IS_OK(status) || !lm_pwd || !nt_pwd) {
+               ldb_transaction_cancel(sam_ctx);
                return NT_STATUS_WRONG_PASSWORD;
        }
 
@@ -75,6 +96,7 @@ NTSTATUS samr_ChangePasswordUser(struct dcesrv_call_state *dce_call, TALLOC_CTX
        D_P16(lm_pwd->hash, r->in.new_lm_crypted->hash, new_lmPwdHash.hash);
        D_P16(new_lmPwdHash.hash, r->in.old_lm_crypted->hash, checkHash.hash);
        if (memcmp(checkHash.hash, lm_pwd, 16) != 0) {
+               ldb_transaction_cancel(sam_ctx);
                return NT_STATUS_WRONG_PASSWORD;
        }
 
@@ -82,39 +104,73 @@ NTSTATUS samr_ChangePasswordUser(struct dcesrv_call_state *dce_call, TALLOC_CTX
        D_P16(nt_pwd->hash, r->in.new_nt_crypted->hash, new_ntPwdHash.hash);
        D_P16(new_ntPwdHash.hash, r->in.old_nt_crypted->hash, checkHash.hash);
        if (memcmp(checkHash.hash, nt_pwd, 16) != 0) {
+               ldb_transaction_cancel(sam_ctx);
                return NT_STATUS_WRONG_PASSWORD;
        }
        
-       /* check the nt cross hash */
-       D_P16(lm_pwd->hash, r->in.nt_cross->hash, checkHash.hash);
-       if (memcmp(checkHash.hash, new_ntPwdHash.hash, 16) != 0) {
-               return NT_STATUS_WRONG_PASSWORD;
+       /* The NT Cross is not required by Win2k3 R2, but if present
+          check the nt cross hash */
+       if (r->in.cross1_present && r->in.nt_cross) {
+               D_P16(lm_pwd->hash, r->in.nt_cross->hash, checkHash.hash);
+               if (memcmp(checkHash.hash, new_ntPwdHash.hash, 16) != 0) {
+                       ldb_transaction_cancel(sam_ctx);
+                       return NT_STATUS_WRONG_PASSWORD;
+               }
        }
 
-       /* check the lm cross hash */
-       D_P16(nt_pwd->hash, r->in.lm_cross->hash, checkHash.hash);
-       if (memcmp(checkHash.hash, new_lmPwdHash.hash, 16) != 0) {
-               return NT_STATUS_WRONG_PASSWORD;
+       /* The LM Cross is not required by Win2k3 R2, but if present
+          check the lm cross hash */
+       if (r->in.cross2_present && r->in.lm_cross) {
+               D_P16(nt_pwd->hash, r->in.lm_cross->hash, checkHash.hash);
+               if (memcmp(checkHash.hash, new_lmPwdHash.hash, 16) != 0) {
+                       ldb_transaction_cancel(sam_ctx);
+                       return NT_STATUS_WRONG_PASSWORD;
+               }
        }
 
-       ZERO_STRUCT(mod);
-       mod.dn = talloc_strdup(mem_ctx, a_state->account_dn);
-       if (!mod.dn) {
+       msg = ldb_msg_new(mem_ctx);
+       if (msg == NULL) {
+               ldb_transaction_cancel(sam_ctx);
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = samdb_set_password(a_state->sam_ctx, mem_ctx,
+       msg->dn = ldb_dn_copy(msg, a_state->account_dn);
+       if (!msg->dn) {
+               ldb_transaction_cancel(sam_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* setup password modify mods on the user DN specified.  This may fail
+        * due to password policies.  */
+       status = samdb_set_password(sam_ctx, mem_ctx,
                                    a_state->account_dn, a_state->domain_state->domain_dn,
-                                   &mod, NULL, &new_lmPwdHash, &new_ntPwdHash, 
-                                   True, NULL);
+                                   msg, NULL, &new_lmPwdHash, &new_ntPwdHash, 
+                                   true, /* this is a user password change */
+                                   NULL,
+                                   NULL);
        if (!NT_STATUS_IS_OK(status)) {
+               ldb_transaction_cancel(sam_ctx);
                return status;
        }
 
-       /* modify the samdb record */
-       ret = samdb_replace(a_state->sam_ctx, mem_ctx, &mod);
+       /* The above call only setup the modifications, this actually
+        * makes the write to the database. */
+       ret = samdb_replace(sam_ctx, mem_ctx, msg);
        if (ret != 0) {
-               return NT_STATUS_UNSUCCESSFUL;
+               DEBUG(2,("Failed to modify record to change password on %s: %s\n",
+                        ldb_dn_get_linearized(a_state->account_dn),
+                        ldb_errstring(sam_ctx)));
+               ldb_transaction_cancel(sam_ctx);
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       /* And this confirms it in a transaction commit */
+       ret = ldb_transaction_commit(sam_ctx);
+       if (ret != 0) {
+               DEBUG(1,("Failed to commit transaction to change password on %s: %s\n",
+                        ldb_dn_get_linearized(a_state->account_dn),
+                        ldb_errstring(sam_ctx)));
+               return NT_STATUS_TRANSACTION_ABORTED;
        }
 
        return NT_STATUS_OK;
@@ -123,48 +179,61 @@ NTSTATUS samr_ChangePasswordUser(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   samr_OemChangePasswordUser2 
 */
-NTSTATUS samr_OemChangePasswordUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+NTSTATUS dcesrv_samr_OemChangePasswordUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                     struct samr_OemChangePasswordUser2 *r)
 {
        NTSTATUS status;
        char new_pass[512];
        uint32_t new_pass_len;
        struct samr_CryptPassword *pwbuf = r->in.password;
-       void *sam_ctx;
-       const char *user_dn, *domain_dn;
+       struct ldb_context *sam_ctx;
+       struct ldb_dn *user_dn;
        int ret;
-       struct ldb_message **res, mod;
-       const char * const attrs[] = { "objectSid", "lmPwdHash", "unicodePwd", NULL };
-       const char *domain_sid;
+       struct ldb_message **res, *mod;
+       const char * const attrs[] = { "objectSid", "dBCSPwd", NULL };
        struct samr_Password *lm_pwd;
        DATA_BLOB lm_pwd_blob;
+       uint8_t new_lm_hash[16];
+       struct samr_Password lm_verifier;
 
        if (pwbuf == NULL) {
-               return NT_STATUS_WRONG_PASSWORD;
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (r->in.hash == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       /* this call doesn't take a policy handle, so we need to open
-          the sam db from scratch */
-       sam_ctx = samdb_connect(mem_ctx);
+       /* To change a password we need to open as system */
+       sam_ctx = samdb_connect(mem_ctx, dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, system_session(mem_ctx, dce_call->conn->dce_ctx->lp_ctx));
        if (sam_ctx == NULL) {
                return NT_STATUS_INVALID_SYSTEM_SERVICE;
        }
 
+       ret = ldb_transaction_start(sam_ctx);
+       if (ret) {
+               DEBUG(1, ("Failed to start transaction: %s\n", ldb_errstring(sam_ctx)));
+               return NT_STATUS_TRANSACTION_ABORTED;
+       }
+
        /* we need the users dn and the domain dn (derived from the
           user SID). We also need the current lm password hash in
           order to decrypt the incoming password */
-       ret = samdb_search(sam_ctx, 
+       ret = gendb_search(sam_ctx, 
                           mem_ctx, NULL, &res, attrs,
                           "(&(sAMAccountName=%s)(objectclass=user))",
-                          r->in.account->name);
+                          r->in.account->string);
        if (ret != 1) {
-               return NT_STATUS_NO_SUCH_USER;
+               ldb_transaction_cancel(sam_ctx);
+               /* Don't give the game away:  (don't allow anonymous users to prove the existance of usernames) */
+               return NT_STATUS_WRONG_PASSWORD;
        }
 
        user_dn = res[0]->dn;
 
        status = samdb_result_passwords(mem_ctx, res[0], &lm_pwd, NULL);
        if (!NT_STATUS_IS_OK(status) || !lm_pwd) {
+               ldb_transaction_cancel(sam_ctx);
                return NT_STATUS_WRONG_PASSWORD;
        }
 
@@ -174,45 +243,69 @@ NTSTATUS samr_OemChangePasswordUser2(struct dcesrv_call_state *dce_call, TALLOC_
        data_blob_free(&lm_pwd_blob);
        
        if (!decode_pw_buffer(pwbuf->data, new_pass, sizeof(new_pass),
-                             &new_pass_len, STR_ASCII)) {
+                             STR_ASCII)) {
+               ldb_transaction_cancel(sam_ctx);
                DEBUG(3,("samr: failed to decode password buffer\n"));
                return NT_STATUS_WRONG_PASSWORD;
        }
 
-       /* work out the domain dn */
-       domain_sid = samdb_result_sid_prefix(mem_ctx, res[0], "objectSid");
-       if (domain_sid == NULL) {
-               return NT_STATUS_NO_SUCH_USER;
+       /* check LM verifier */
+       if (lm_pwd == NULL) {
+               ldb_transaction_cancel(sam_ctx);
+               return NT_STATUS_WRONG_PASSWORD;
        }
 
-       domain_dn = samdb_search_string(sam_ctx, mem_ctx, NULL, "dn",
-                                       "(objectSid=%s)", domain_sid);
-       if (!domain_dn) {
-               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       E_deshash(new_pass, new_lm_hash);
+       E_old_pw_hash(new_lm_hash, lm_pwd->hash, lm_verifier.hash);
+       if (memcmp(lm_verifier.hash, r->in.hash->hash, 16) != 0) {
+               ldb_transaction_cancel(sam_ctx);
+               return NT_STATUS_WRONG_PASSWORD;
        }
 
+       mod = ldb_msg_new(mem_ctx);
+       if (mod == NULL) {
+               ldb_transaction_cancel(sam_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       ZERO_STRUCT(mod);
-       mod.dn = talloc_strdup(mem_ctx, user_dn);
-       if (!mod.dn) {
+       mod->dn = ldb_dn_copy(mod, user_dn);
+       if (!mod->dn) {
+               ldb_transaction_cancel(sam_ctx);
                return NT_STATUS_NO_MEMORY;
        }
 
-       /* set the password - samdb needs to know both the domain and user DNs,
-          so the domain password policy can be used */
+       /* set the password on the user DN specified.  This may fail
+        * due to password policies */
        status = samdb_set_password(sam_ctx, mem_ctx,
-                                   user_dn, domain_dn
-                                   &mod, new_pass, 
+                                   user_dn, NULL
+                                   mod, new_pass, 
                                    NULL, NULL,
-                                   True, NULL);
+                                   true, /* this is a user password change */
+                                   NULL, 
+                                   NULL);
        if (!NT_STATUS_IS_OK(status)) {
+               ldb_transaction_cancel(sam_ctx);
                return status;
        }
 
-       /* modify the samdb record */
-       ret = samdb_replace(sam_ctx, mem_ctx, &mod);
+       /* The above call only setup the modifications, this actually
+        * makes the write to the database. */
+       ret = samdb_replace(sam_ctx, mem_ctx, mod);
        if (ret != 0) {
-               return NT_STATUS_UNSUCCESSFUL;
+               DEBUG(2,("Failed to modify record to change password on %s: %s\n",
+                        ldb_dn_get_linearized(user_dn),
+                        ldb_errstring(sam_ctx)));
+               ldb_transaction_cancel(sam_ctx);
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       /* And this confirms it in a transaction commit */
+       ret = ldb_transaction_commit(sam_ctx);
+       if (ret != 0) {
+               DEBUG(1,("Failed to commit transaction to change password on %s: %s\n",
+                        ldb_dn_get_linearized(user_dn),
+                        ldb_errstring(sam_ctx)));
+               return NT_STATUS_TRANSACTION_ABORTED;
        }
 
        return NT_STATUS_OK;
@@ -222,59 +315,61 @@ NTSTATUS samr_OemChangePasswordUser2(struct dcesrv_call_state *dce_call, TALLOC_
 /* 
   samr_ChangePasswordUser3 
 */
-NTSTATUS samr_ChangePasswordUser3(struct dcesrv_call_state *dce_call, 
+NTSTATUS dcesrv_samr_ChangePasswordUser3(struct dcesrv_call_state *dce_call, 
                                  TALLOC_CTX *mem_ctx,
                                  struct samr_ChangePasswordUser3 *r)
 {      
        NTSTATUS status;
        char new_pass[512];
-       uint32_t new_pass_len;
-       void *sam_ctx = NULL;
-       const char *user_dn, *domain_dn = NULL;
+       struct ldb_context *sam_ctx = NULL;
+       struct ldb_dn *user_dn;
        int ret;
-       struct ldb_message **res, mod;
-       const char * const attrs[] = { "objectSid", "ntPwdHash", "unicodePwd", NULL };
-       const char * const dom_attrs[] = { "minPwdLength", "pwdHistoryLength", 
-                                          "pwdProperties", "minPwdAge", "maxPwdAge", 
-                                          NULL };
-       const char *domain_sid;
-       struct samr_Password *nt_pwd;
+       struct ldb_message **res, *mod;
+       const char * const attrs[] = { "unicodePwd", "dBCSPwd", NULL };
+       struct samr_Password *nt_pwd, *lm_pwd;
        DATA_BLOB nt_pwd_blob;
-       struct samr_DomInfo1 *dominfo;
-       struct samr_ChangeReject *reject;
-       uint32_t reason = 0;
+       struct samr_DomInfo1 *dominfo = NULL;
+       struct samr_ChangeReject *reject = NULL;
+       enum samr_RejectReason reason = SAMR_REJECT_OTHER;
+       uint8_t new_nt_hash[16], new_lm_hash[16];
+       struct samr_Password nt_verifier, lm_verifier;
 
        ZERO_STRUCT(r->out);
 
        if (r->in.nt_password == NULL ||
            r->in.nt_verifier == NULL) {
-               status = NT_STATUS_INVALID_PARAMETER;
-               goto failed;
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       /* this call doesn't take a policy handle, so we need to open
-          the sam db from scratch */
-       sam_ctx = samdb_connect(mem_ctx);
+       /* To change a password we need to open as system */
+       sam_ctx = samdb_connect(mem_ctx, dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, system_session(mem_ctx, dce_call->conn->dce_ctx->lp_ctx));
        if (sam_ctx == NULL) {
-               status = NT_STATUS_INVALID_SYSTEM_SERVICE;
-               goto failed;
+               return NT_STATUS_INVALID_SYSTEM_SERVICE;
+       }
+
+       ret = ldb_transaction_start(sam_ctx);
+       if (ret) {
+               talloc_free(sam_ctx);
+               DEBUG(1, ("Failed to start transaction: %s\n", ldb_errstring(sam_ctx)));
+               return NT_STATUS_TRANSACTION_ABORTED;
        }
 
        /* we need the users dn and the domain dn (derived from the
           user SID). We also need the current lm and nt password hashes
           in order to decrypt the incoming passwords */
-       ret = samdb_search(sam_ctx, 
+       ret = gendb_search(sam_ctx, 
                           mem_ctx, NULL, &res, attrs,
                           "(&(sAMAccountName=%s)(objectclass=user))",
-                          r->in.account->name);
+                          r->in.account->string);
        if (ret != 1) {
-               status = NT_STATUS_NO_SUCH_USER;
+               /* Don't give the game away:  (don't allow anonymous users to prove the existance of usernames) */
+               status = NT_STATUS_WRONG_PASSWORD;
                goto failed;
        }
 
        user_dn = res[0]->dn;
 
-       status = samdb_result_passwords(mem_ctx, res[0], NULL, &nt_pwd);
+       status = samdb_result_passwords(mem_ctx, res[0], &lm_pwd, &nt_pwd);
        if (!NT_STATUS_IS_OK(status) ) {
                goto failed;
        }
@@ -290,91 +385,98 @@ NTSTATUS samr_ChangePasswordUser3(struct dcesrv_call_state *dce_call,
        data_blob_free(&nt_pwd_blob);
 
        if (!decode_pw_buffer(r->in.nt_password->data, new_pass, sizeof(new_pass),
-                             &new_pass_len, STR_UNICODE)) {
+                             STR_UNICODE)) {
                DEBUG(3,("samr: failed to decode password buffer\n"));
                status = NT_STATUS_WRONG_PASSWORD;
                goto failed;
        }
 
-       /* work out the domain dn */
-       domain_sid = samdb_result_sid_prefix(mem_ctx, res[0], "objectSid");
-       if (domain_sid == NULL) {
-               status = NT_STATUS_NO_SUCH_DOMAIN;
+       if (r->in.nt_verifier == NULL) {
+               status = NT_STATUS_WRONG_PASSWORD;
                goto failed;
        }
 
-       domain_dn = samdb_search_string(sam_ctx, mem_ctx, NULL, "dn",
-                                       "(objectSid=%s)", domain_sid);
-       if (!domain_dn) {
-               status = NT_STATUS_INTERNAL_DB_CORRUPTION;
+       /* check NT verifier */
+       E_md4hash(new_pass, new_nt_hash);
+       E_old_pw_hash(new_nt_hash, nt_pwd->hash, nt_verifier.hash);
+       if (memcmp(nt_verifier.hash, r->in.nt_verifier->hash, 16) != 0) {
+               status = NT_STATUS_WRONG_PASSWORD;
                goto failed;
        }
 
+       /* check LM verifier */
+       if (lm_pwd && r->in.lm_verifier != NULL) {
+               E_deshash(new_pass, new_lm_hash);
+               E_old_pw_hash(new_nt_hash, lm_pwd->hash, lm_verifier.hash);
+               if (memcmp(lm_verifier.hash, r->in.lm_verifier->hash, 16) != 0) {
+                       status = NT_STATUS_WRONG_PASSWORD;
+                       goto failed;
+               }
+       }
+
+
+       mod = ldb_msg_new(mem_ctx);
+       if (mod == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       ZERO_STRUCT(mod);
-       mod.dn = talloc_strdup(mem_ctx, user_dn);
-       if (!mod.dn) {
+       mod->dn = ldb_dn_copy(mod, user_dn);
+       if (!mod->dn) {
                status = NT_STATUS_NO_MEMORY;
                goto failed;
        }
 
-       /* set the password - samdb needs to know both the domain and user DNs,
-          so the domain password policy can be used */
+       /* set the password on the user DN specified.  This may fail
+        * due to password policies */
        status = samdb_set_password(sam_ctx, mem_ctx,
-                                   user_dn, domain_dn
-                                   &mod, new_pass, 
+                                   user_dn, NULL
+                                   mod, new_pass, 
                                    NULL, NULL,
-                                   True, &reason);
+                                   true, /* this is a user password change */
+                                   &reason, 
+                                   &dominfo);
        if (!NT_STATUS_IS_OK(status)) {
                goto failed;
        }
 
-       /* modify the samdb record */
-       ret = samdb_replace(sam_ctx, mem_ctx, &mod);
+       /* The above call only setup the modifications, this actually
+        * makes the write to the database. */
+       ret = samdb_replace(sam_ctx, mem_ctx, mod);
        if (ret != 0) {
+               DEBUG(2,("samdb_replace failed to change password for %s: %s\n",
+                        ldb_dn_get_linearized(user_dn),
+                        ldb_errstring(sam_ctx)));
                status = NT_STATUS_UNSUCCESSFUL;
                goto failed;
        }
 
+       /* And this confirms it in a transaction commit */
+       ret = ldb_transaction_commit(sam_ctx);
+       if (ret != 0) {
+               DEBUG(1,("Failed to commit transaction to change password on %s: %s\n",
+                        ldb_dn_get_linearized(user_dn),
+                        ldb_errstring(sam_ctx)));
+               status = NT_STATUS_TRANSACTION_ABORTED;
+               goto failed;
+       }
+
        return NT_STATUS_OK;
 
 failed:
-       ret = samdb_search(sam_ctx, 
-                          mem_ctx, NULL, &res, dom_attrs,
-                          "dn=%s", domain_dn);
+       ldb_transaction_cancel(sam_ctx);
+       talloc_free(sam_ctx);
 
-       if (ret != 1) {
-               return status;
-       }
+       reject = talloc(mem_ctx, struct samr_ChangeReject);
+       r->out.dominfo = dominfo;
+       r->out.reject = reject;
 
-       /* on failure we need to fill in the reject reasons */
-       dominfo = talloc_p(mem_ctx, struct samr_DomInfo1);
-       if (dominfo == NULL) {
-               return status;
-       }
-       reject = talloc_p(mem_ctx, struct samr_ChangeReject);
        if (reject == NULL) {
                return status;
        }
-
-       ZERO_STRUCTP(dominfo);
        ZERO_STRUCTP(reject);
 
        reject->reason = reason;
 
-       r->out.dominfo = dominfo;
-       r->out.reject = reject;
-
-       if (!domain_dn) {
-               return status;
-       }
-
-       dominfo->min_password_len    = samdb_result_uint (res[0], "minPwdLength", 0);
-       dominfo->password_properties = samdb_result_uint (res[0], "pwdProperties", 0);
-       dominfo->password_history    = samdb_result_uint (res[0], "pwdHistoryLength", 0);
-       dominfo->max_password_age    = samdb_result_int64(res[0], "maxPwdAge", 0);
-       dominfo->min_password_age    = samdb_result_int64(res[0], "minPwdAge", 0);
-
        return status;
 }
 
@@ -384,7 +486,7 @@ failed:
 
   easy - just a subset of samr_ChangePasswordUser3
 */
-NTSTATUS samr_ChangePasswordUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+NTSTATUS dcesrv_samr_ChangePasswordUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                  struct samr_ChangePasswordUser2 *r)
 {
        struct samr_ChangePasswordUser3 r2;
@@ -398,274 +500,9 @@ NTSTATUS samr_ChangePasswordUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
        r2.in.lm_verifier = r->in.lm_verifier;
        r2.in.password3 = NULL;
 
-       return samr_ChangePasswordUser3(dce_call, mem_ctx, &r2);
-}
-
-
-/*
-  check that a password is sufficiently complex
-*/
-BOOL samdb_password_complexity_ok(const char *pass)
-{
-       return check_password_quality(pass);
+       return dcesrv_samr_ChangePasswordUser3(dce_call, mem_ctx, &r2);
 }
 
-/*
-  set the user password using plaintext, obeying any user or domain
-  password restrictions
-
-  note that this function doesn't actually store the result in the
-  database, it just fills in the "mod" structure with ldb modify
-  elements to setup the correct change when samdb_replace() is
-  called. This allows the caller to combine the change with other
-  changes (as is needed by some of the set user info levels)
-*/
-NTSTATUS samdb_set_password(void *ctx, TALLOC_CTX *mem_ctx,
-                           const char *user_dn, const char *domain_dn,
-                           struct ldb_message *mod,
-                           const char *new_pass,
-                           struct samr_Password *lmNewHash, 
-                           struct samr_Password *ntNewHash,
-                           BOOL user_change,
-                           uint32_t *reject_reason)
-{
-       const char * const user_attrs[] = { "userAccountControl", "lmPwdHistory", 
-                                           "ntPwdHistory", "unicodePwd", 
-                                           "lmPwdHash", "ntPwdHash", "badPwdCount", 
-                                           NULL };
-       const char * const domain_attrs[] = { "pwdProperties", "pwdHistoryLength", 
-                                             "maxPwdAge", "minPwdAge", 
-                                             "minPwdLength", "pwdLastSet", NULL };
-       const char *unicodePwd;
-       NTTIME pwdLastSet;
-       int64_t minPwdAge;
-       uint_t minPwdLength, pwdProperties, pwdHistoryLength;
-       uint_t userAccountControl, badPwdCount;
-       struct samr_Password *lmPwdHistory, *ntPwdHistory, lmPwdHash, ntPwdHash;
-       struct samr_Password *new_lmPwdHistory, *new_ntPwdHistory;
-       struct samr_Password local_lmNewHash, local_ntNewHash;
-       int lmPwdHistory_len, ntPwdHistory_len;
-       struct ldb_message **res;
-       int count;
-       time_t now = time(NULL);
-       NTTIME now_nt;
-       int i;
-
-       /* we need to know the time to compute password age */
-       unix_to_nt_time(&now_nt, now);
-
-       /* pull all the user parameters */
-       count = samdb_search(ctx, mem_ctx, NULL, &res, user_attrs, "dn=%s", user_dn);
-       if (count != 1) {
-               return NT_STATUS_INTERNAL_DB_CORRUPTION;
-       }
-       unicodePwd =         samdb_result_string(res[0], "unicodePwd", NULL);
-       userAccountControl = samdb_result_uint(res[0],   "userAccountControl", 0);
-       badPwdCount =        samdb_result_uint(res[0],   "badPwdCount", 0);
-       lmPwdHistory_len =   samdb_result_hashes(mem_ctx, res[0], 
-                                                "lmPwdHistory", &lmPwdHistory);
-       ntPwdHistory_len =   samdb_result_hashes(mem_ctx, res[0], 
-                                                "ntPwdHistory", &ntPwdHistory);
-       lmPwdHash =          samdb_result_hash(res[0],   "lmPwdHash");
-       ntPwdHash =          samdb_result_hash(res[0],   "ntPwdHash");
-       pwdLastSet =         samdb_result_uint64(res[0], "pwdLastSet", 0);
-
-       /* pull the domain parameters */
-       count = samdb_search(ctx, mem_ctx, NULL, &res, domain_attrs, "dn=%s", domain_dn);
-       if (count != 1) {
-               return NT_STATUS_INTERNAL_DB_CORRUPTION;
-       }
-       pwdProperties =    samdb_result_uint(res[0],   "pwdProperties", 0);
-       pwdHistoryLength = samdb_result_uint(res[0],   "pwdHistoryLength", 0);
-       minPwdLength =     samdb_result_uint(res[0],   "minPwdLength", 0);
-       minPwdAge =        samdb_result_int64(res[0],  "minPwdAge", 0);
-
-       if (new_pass) {
-               /* check the various password restrictions */
-               if (minPwdLength > str_charnum(new_pass)) {
-                       if (reject_reason) {
-                               *reject_reason = SAMR_REJECT_TOO_SHORT;
-                       }
-                       return NT_STATUS_PASSWORD_RESTRICTION;
-               }
-               
-               /* possibly check password complexity */
-               if (pwdProperties & DOMAIN_PASSWORD_COMPLEX &&
-                   !samdb_password_complexity_ok(new_pass)) {
-                       if (reject_reason) {
-                               *reject_reason = SAMR_REJECT_COMPLEXITY;
-                       }
-                       return NT_STATUS_PASSWORD_RESTRICTION;
-               }
-               
-               /* compute the new nt and lm hashes */
-               if (E_deshash(new_pass, local_lmNewHash.hash)) {
-                       lmNewHash = &local_lmNewHash;
-               }
-               E_md4hash(new_pass, local_ntNewHash.hash);
-               ntNewHash = &local_ntNewHash;
-       }
-
-       if (user_change) {
-               /* are all password changes disallowed? */
-               if (pwdProperties & DOMAIN_REFUSE_PASSWORD_CHANGE) {
-                       if (reject_reason) {
-                               *reject_reason = SAMR_REJECT_OTHER;
-                       }
-                       return NT_STATUS_PASSWORD_RESTRICTION;
-               }
-               
-               /* can this user change password? */
-               if (userAccountControl & UF_PASSWD_CANT_CHANGE) {
-                       if (reject_reason) {
-                               *reject_reason = SAMR_REJECT_OTHER;
-                       }
-                       return NT_STATUS_PASSWORD_RESTRICTION;
-               }
-               
-               /* yes, this is a minus. The ages are in negative 100nsec units! */
-               if (pwdLastSet - minPwdAge > now_nt) {
-                       if (reject_reason) {
-                               *reject_reason = SAMR_REJECT_OTHER;
-                       }
-                       return NT_STATUS_PASSWORD_RESTRICTION;
-               }
-
-               /* check the immediately past password */
-               if (pwdHistoryLength > 0) {
-                       if (lmNewHash && memcmp(lmNewHash->hash, lmPwdHash.hash, 16) == 0) {
-                               if (reject_reason) {
-                                       *reject_reason = SAMR_REJECT_COMPLEXITY;
-                               }
-                               return NT_STATUS_PASSWORD_RESTRICTION;
-                       }
-                       if (ntNewHash && memcmp(ntNewHash->hash, ntPwdHash.hash, 16) == 0) {
-                               if (reject_reason) {
-                                       *reject_reason = SAMR_REJECT_COMPLEXITY;
-                               }
-                               return NT_STATUS_PASSWORD_RESTRICTION;
-                       }
-               }
-               
-               /* check the password history */
-               lmPwdHistory_len = MIN(lmPwdHistory_len, pwdHistoryLength);
-               ntPwdHistory_len = MIN(ntPwdHistory_len, pwdHistoryLength);
-               
-               if (pwdHistoryLength > 0) {
-                       if (unicodePwd && new_pass && strcmp(unicodePwd, new_pass) == 0) {
-                               if (reject_reason) {
-                                       *reject_reason = SAMR_REJECT_COMPLEXITY;
-                               }
-                               return NT_STATUS_PASSWORD_RESTRICTION;
-                       }
-                       if (lmNewHash && memcmp(lmNewHash->hash, lmPwdHash.hash, 16) == 0) {
-                               if (reject_reason) {
-                                       *reject_reason = SAMR_REJECT_COMPLEXITY;
-                               }
-                               return NT_STATUS_PASSWORD_RESTRICTION;
-                       }
-                       if (ntNewHash && memcmp(ntNewHash->hash, ntPwdHash.hash, 16) == 0) {
-                               if (reject_reason) {
-                                       *reject_reason = SAMR_REJECT_COMPLEXITY;
-                               }
-                               return NT_STATUS_PASSWORD_RESTRICTION;
-                       }
-               }
-               
-               for (i=0; lmNewHash && i<lmPwdHistory_len;i++) {
-                       if (memcmp(lmNewHash->hash, lmPwdHistory[i].hash, 16) == 0) {
-                               if (reject_reason) {
-                                       *reject_reason = SAMR_REJECT_COMPLEXITY;
-                               }
-                               return NT_STATUS_PASSWORD_RESTRICTION;
-                       }
-               }
-               for (i=0; ntNewHash && i<ntPwdHistory_len;i++) {
-                       if (memcmp(ntNewHash->hash, ntPwdHistory[i].hash, 16) == 0) {
-                               if (reject_reason) {
-                                       *reject_reason = SAMR_REJECT_COMPLEXITY;
-                               }
-                               return NT_STATUS_PASSWORD_RESTRICTION;
-                       }
-               }
-       }
-
-#define CHECK_RET(x) do { if (x != 0) return NT_STATUS_NO_MEMORY; } while(0)
-
-       /* the password is acceptable. Start forming the new fields */
-       if (lmNewHash) {
-               CHECK_RET(samdb_msg_add_hash(ctx, mem_ctx, mod, "lmPwdHash", *lmNewHash));
-       } else {
-               CHECK_RET(samdb_msg_add_delete(ctx, mem_ctx, mod, "lmPwdHash"));
-       }
-
-       if (ntNewHash) {
-               CHECK_RET(samdb_msg_add_hash(ctx, mem_ctx, mod, "ntPwdHash", *ntNewHash));
-       } else {
-               CHECK_RET(samdb_msg_add_delete(ctx, mem_ctx, mod, "ntPwdHash"));
-       }
-
-       if (new_pass && (pwdProperties & DOMAIN_PASSWORD_STORE_CLEARTEXT) &&
-           (userAccountControl & UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED)) {
-               CHECK_RET(samdb_msg_add_string(ctx, mem_ctx, mod, 
-                                              "unicodePwd", new_pass));
-       } else {
-               CHECK_RET(samdb_msg_add_delete(ctx, mem_ctx, mod, "unicodePwd"));
-       }
-
-       CHECK_RET(samdb_msg_add_uint64(ctx, mem_ctx, mod, "pwdLastSet", now_nt));
-       
-       if (pwdHistoryLength == 0) {
-               CHECK_RET(samdb_msg_add_delete(ctx, mem_ctx, mod, "lmPwdHistory"));
-               CHECK_RET(samdb_msg_add_delete(ctx, mem_ctx, mod, "ntPwdHistory"));
-               return NT_STATUS_OK;
-       }
-       
-       /* store the password history */
-       new_lmPwdHistory = talloc_array_p(mem_ctx, struct samr_Password, 
-                                         pwdHistoryLength);
-       if (!new_lmPwdHistory) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       new_ntPwdHistory = talloc_array_p(mem_ctx, struct samr_Password, 
-                                         pwdHistoryLength);
-       if (!new_ntPwdHistory) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       for (i=0;i<MIN(pwdHistoryLength-1, lmPwdHistory_len);i++) {
-               new_lmPwdHistory[i+1] = lmPwdHistory[i];
-       }
-       for (i=0;i<MIN(pwdHistoryLength-1, ntPwdHistory_len);i++) {
-               new_ntPwdHistory[i+1] = ntPwdHistory[i];
-       }
-
-       /* Don't store 'long' passwords in the LM history, 
-          but make sure to 'expire' one password off the other end */
-       if (lmNewHash) {
-               new_lmPwdHistory[0] = *lmNewHash;
-       } else {
-               ZERO_STRUCT(new_lmPwdHistory[0]);
-       }
-       lmPwdHistory_len = MIN(lmPwdHistory_len + 1, pwdHistoryLength);
-
-       if (ntNewHash) {
-               new_ntPwdHistory[0] = *ntNewHash;
-       } else {
-               ZERO_STRUCT(new_ntPwdHistory[0]);
-       }
-       ntPwdHistory_len = MIN(ntPwdHistory_len + 1, pwdHistoryLength);
-       
-       CHECK_RET(samdb_msg_add_hashes(ctx, mem_ctx, mod, 
-                                      "lmPwdHistory", 
-                                      new_lmPwdHistory, 
-                                      lmPwdHistory_len));
-
-       CHECK_RET(samdb_msg_add_hashes(ctx, mem_ctx, mod, 
-                                      "ntPwdHistory", 
-                                      new_ntPwdHistory, 
-                                      ntPwdHistory_len));
-       return NT_STATUS_OK;
-}
 
 /*
   set password via a samr_CryptPassword buffer
@@ -674,26 +511,24 @@ NTSTATUS samdb_set_password(void *ctx, TALLOC_CTX *mem_ctx,
 */
 NTSTATUS samr_set_password(struct dcesrv_call_state *dce_call,
                           void *sam_ctx,
-                          const char *account_dn, const char *domain_dn,
+                          struct ldb_dn *account_dn, struct ldb_dn *domain_dn,
                           TALLOC_CTX *mem_ctx,
                           struct ldb_message *msg, 
                           struct samr_CryptPassword *pwbuf)
 {
+       NTSTATUS nt_status;
        char new_pass[512];
-       uint32_t new_pass_len;
        DATA_BLOB session_key = data_blob(NULL, 0);
 
-       session_key = dce_call->conn->transport_session_key;
-
-       if (session_key.length == 0) {
-               DEBUG(3,("Bad session key in samr_set_password\n"));
-               return NT_STATUS_NO_USER_SESSION_KEY;
+       nt_status = dcesrv_fetch_session_key(dce_call->conn, &session_key);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               return nt_status;
        }
 
        arcfour_crypt_blob(pwbuf->data, 516, &session_key);
 
        if (!decode_pw_buffer(pwbuf->data, new_pass, sizeof(new_pass),
-                             &new_pass_len, STR_UNICODE)) {
+                             STR_UNICODE)) {
                DEBUG(3,("samr: failed to decode password buffer\n"));
                return NT_STATUS_WRONG_PASSWORD;
        }
@@ -704,8 +539,8 @@ NTSTATUS samr_set_password(struct dcesrv_call_state *dce_call,
                                  account_dn, domain_dn, 
                                  msg, new_pass, 
                                  NULL, NULL,
-                                 False /* This is a password set, not change */,
-                                 NULL);
+                                 false, /* This is a password set, not change */
+                                 NULL, NULL);
 }
 
 
@@ -715,23 +550,22 @@ NTSTATUS samr_set_password(struct dcesrv_call_state *dce_call,
   password when applied
 */
 NTSTATUS samr_set_password_ex(struct dcesrv_call_state *dce_call,
-                             void *sam_ctx,
-                             const char *account_dn, const char *domain_dn,
+                             struct ldb_context *sam_ctx,
+                             struct ldb_dn *account_dn, struct ldb_dn *domain_dn,
                              TALLOC_CTX *mem_ctx,
                              struct ldb_message *msg, 
                              struct samr_CryptPasswordEx *pwbuf)
 {
+       NTSTATUS nt_status;
        char new_pass[512];
        uint32_t new_pass_len;
        DATA_BLOB co_session_key;
        DATA_BLOB session_key = data_blob(NULL, 0);
        struct MD5Context ctx;
 
-       session_key = dce_call->conn->transport_session_key;
-
-       if (session_key.length == 0) {
-               DEBUG(3,("Bad session key in samr_set_password\n"));
-               return NT_STATUS_NO_USER_SESSION_KEY;
+       nt_status = dcesrv_fetch_session_key(dce_call->conn, &session_key);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               return nt_status;
        }
 
        co_session_key = data_blob_talloc(mem_ctx, NULL, 16);
@@ -747,7 +581,7 @@ NTSTATUS samr_set_password_ex(struct dcesrv_call_state *dce_call,
        arcfour_crypt_blob(pwbuf->data, 516, &co_session_key);
 
        if (!decode_pw_buffer(pwbuf->data, new_pass, sizeof(new_pass),
-                             &new_pass_len, STR_UNICODE)) {
+                             STR_UNICODE)) {
                DEBUG(3,("samr: failed to decode password buffer\n"));
                return NT_STATUS_WRONG_PASSWORD;
        }
@@ -758,7 +592,8 @@ NTSTATUS samr_set_password_ex(struct dcesrv_call_state *dce_call,
                                  account_dn, domain_dn, 
                                  msg, new_pass, 
                                  NULL, NULL,
-                                 False,
-                                 NULL);
+                                 false, /* This is a password set, not change */
+                                 NULL, NULL);
 }
 
+