Turn the pdb_rid_algorithm into a capabilities call that returns flags
[metze/samba/wip.git] / source3 / passdb / passdb.c
index 042e6fc39b3177163f58db7f49f98cf3b89e5950..502c3728a35906586a46074597cd4778fa774b93 100644 (file)
@@ -7,43 +7,43 @@
    Copyright (C) Andrew Bartlett               2001-2002
    Copyright (C) Simo Sorce                    2003
    Copyright (C) Volker Lendecke               2006
-      
+
    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 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "../libcli/auth/libcli_auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
 
 /******************************************************************
- get the default domain/netbios name to be used when 
- testing authentication.  For example, if you connect
- to a Windows member server using a bogus domain name, the
- Windows box will map the BOGUS\user to DOMAIN\user.  A 
- standalone box will map to WKS\user.
+ Get the default domain/netbios name to be used when
+ testing authentication.
+
+ LEGACY: this function provides the legacy domain mapping used with
+        the lp_map_untrusted_to_domain() parameter
 ******************************************************************/
 
 const char *my_sam_name(void)
 {
-       /* standalone servers can only use the local netbios name */
-       if ( lp_server_role() == ROLE_STANDALONE )
-               return global_myname();
+       /* Standalone servers can only use the local netbios name */
+       if ( lp_server_role() == ROLE_STANDALONE )
+               return global_myname();
 
-       /* Windows domain members default to the DOMAIN
-          name when not specified */
-       return lp_workgroup();
+       /* Default to the DOMAIN name when not specified */
+       return lp_workgroup();
 }
 
 /**********************************************************************
@@ -67,16 +67,16 @@ static int samu_destroy(struct samu *user)
 struct samu *samu_new( TALLOC_CTX *ctx )
 {
        struct samu *user;
-       
+
        if ( !(user = TALLOC_ZERO_P( ctx, struct samu )) ) {
                DEBUG(0,("samuser_new: Talloc failed!\n"));
                return NULL;
        }
-       
+
        talloc_set_destructor( user, samu_destroy );
-       
+
        /* no initial methods */
-       
+
        user->methods = NULL;
 
         /* Don't change these timestamp settings without a good reason.
@@ -98,7 +98,7 @@ struct samu *samu_new( TALLOC_CTX *ctx )
 
        /* Some parts of samba strlen their pdb_get...() returns, 
           so this keeps the interface unchanged for now. */
-          
+
        user->username = "";
        user->domain = "";
        user->nt_username = "";
@@ -118,8 +118,7 @@ struct samu *samu_new( TALLOC_CTX *ctx )
           asks for a filtered list of users. */
 
        user->acct_ctrl = ACB_NORMAL;
-       
-       
+
        return user;
 }
 
@@ -140,7 +139,7 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
        }
 
        /* Basic properties based upon the Unix account information */
-       
+
        pdb_set_username(user, pwd->pw_name, PDB_SET);
        pdb_set_fullname(user, pwd->pw_gecos, PDB_SET);
        pdb_set_domain (user, get_global_sam_name(), PDB_DEFAULT);
@@ -149,29 +148,29 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
           will be rejected by other parts of the Samba code. 
           Rely on pdb_get_group_sid() to "Do The Right Thing" (TM)  
           --jerry */
-          
+
        gid_to_sid(&group_sid, pwd->pw_gid);
        pdb_set_group_sid(user, &group_sid, PDB_SET);
 #endif
-       
+
        /* save the password structure for later use */
-       
+
        user->unix_pw = tcopy_passwd( user, pwd );
 
        /* Special case for the guest account which must have a RID of 501 */
-       
+
        if ( strequal( pwd->pw_name, guest_account ) ) {
                if ( !pdb_set_user_sid_from_rid(user, DOMAIN_USER_RID_GUEST, PDB_DEFAULT)) {
                        return NT_STATUS_NO_SUCH_USER;
                }
                return NT_STATUS_OK;
        }
-       
+
        /* Non-guest accounts...Check for a workstation or user account */
 
        if (pwd->pw_name[strlen(pwd->pw_name)-1] == '$') {
                /* workstation */
-               
+
                if (!pdb_set_acct_ctrl(user, ACB_WSTRUST, PDB_DEFAULT)) {
                        DEBUG(1, ("Failed to set 'workstation account' flags for user %s.\n", 
                                pwd->pw_name));
@@ -180,15 +179,15 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
        } 
        else {
                /* user */
-               
+
                if (!pdb_set_acct_ctrl(user, ACB_NORMAL, PDB_DEFAULT)) {
                        DEBUG(1, ("Failed to set 'normal account' flags for user %s.\n", 
                                pwd->pw_name));
                        return NT_STATUS_INVALID_ACCOUNT_NAME;
                }
-               
+
                /* set some basic attributes */
-       
+
                pdb_set_profile_path(user, talloc_sub_specified(user, 
                        lp_logon_path(), pwd->pw_name, domain, pwd->pw_uid, pwd->pw_gid), 
                        PDB_DEFAULT);           
@@ -202,16 +201,16 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
                        lp_logon_script(), pwd->pw_name, domain, pwd->pw_uid, pwd->pw_gid), 
                        PDB_DEFAULT);
        }
-       
+
        /* Now deal with the user SID.  If we have a backend that can generate 
           RIDs, then do so.  But sometimes the caller just wanted a structure 
           initialized and will fill in these fields later (such as from a 
           netr_SamInfo3 structure) */
 
-       if ( create && !pdb_rid_algorithm() ) {
+       if ( create && (pdb_capabilities() & PDB_CAP_STORE_RIDS)) {
                uint32 user_rid;
                DOM_SID user_sid;
-               
+
                if ( !pdb_new_rid( &user_rid ) ) {
                        DEBUG(3, ("Could not allocate a new RID\n"));
                        return NT_STATUS_ACCESS_DENIED;
@@ -224,18 +223,18 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
                        DEBUG(3, ("pdb_set_user_sid failed\n"));
                        return NT_STATUS_INTERNAL_ERROR;
                }
-               
+
                return NT_STATUS_OK;
        }
 
        /* generate a SID for the user with the RID algorithm */
-       
+
        urid = algorithmic_pdb_uid_to_user_rid( user->unix_pw->pw_uid );
-               
+
        if ( !pdb_set_user_sid_from_rid( user, urid, PDB_SET) ) {
                return NT_STATUS_INTERNAL_ERROR;
        }
-       
+
        return NT_STATUS_OK;
 }
 
@@ -365,10 +364,10 @@ bool pdb_gethexpwd(const char *p, unsigned char *pwd)
        unsigned char   lonybble, hinybble;
        const char      *hexchars = "0123456789ABCDEF";
        char           *p1, *p2;
-       
+
        if (!p)
                return false;
-       
+
        for (i = 0; i < 32; i += 2) {
                hinybble = toupper_ascii(p[i]);
                lonybble = toupper_ascii(p[i + 1]);
@@ -554,16 +553,16 @@ bool lookup_global_sam_name(const char *name, int flags, uint32_t *rid,
 {
        GROUP_MAP map;
        bool ret;
-       
+
        /* Windows treats "MACHINE\None" as a special name for 
           rid 513 on non-DCs.  You cannot create a user or group
           name "None" on Windows.  You will get an error that 
           the group already exists. */
-          
+
        if ( strequal( name, "None" ) ) {
                *rid = DOMAIN_GROUP_RID_USERS;
                *type = SID_NAME_DOM_GRP;
-               
+
                return True;
        }
 
@@ -578,7 +577,7 @@ bool lookup_global_sam_name(const char *name, int flags, uint32_t *rid,
                if ( !(sam_account = samu_new( NULL )) ) {
                        return False;
                }
-       
+
                become_root();
                ret =  pdb_getsampwnam(sam_account, name);
                unbecome_root();
@@ -586,7 +585,7 @@ bool lookup_global_sam_name(const char *name, int flags, uint32_t *rid,
                if (ret) {
                        sid_copy(&user_sid, pdb_get_user_sid(sam_account));
                }
-               
+
                TALLOC_FREE(sam_account);
 
                if (ret) {
@@ -628,7 +627,14 @@ bool lookup_global_sam_name(const char *name, int flags, uint32_t *rid,
 }
 
 /*************************************************************
- Change a password entry in the local smbpasswd file.
+ Change a password entry in the local passdb backend.
+
+ Assumptions:
+  - always called as root
+  - ignores the account type except when adding a new account
+  - will create/delete the unix account if the relative
+    add/delete user script is configured
+
  *************************************************************/
 
 NTSTATUS local_password_change(const char *user_name,
@@ -637,133 +643,132 @@ NTSTATUS local_password_change(const char *user_name,
                                char **pp_err_str,
                                char **pp_msg_str)
 {
-       struct samu *sam_pass=NULL;
-       uint32 other_acb;
+       TALLOC_CTX *tosctx;
+       struct samu *sam_pass;
+       uint32_t acb;
+       uint32_t rid;
        NTSTATUS result;
+       bool user_exists;
+       int ret = -1;
 
        *pp_err_str = NULL;
        *pp_msg_str = NULL;
 
-       /* Get the smb passwd entry for this user */
+       tosctx = talloc_tos();
 
-       if ( !(sam_pass = samu_new( NULL )) ) {
-               return NT_STATUS_NO_MEMORY;
+       sam_pass = samu_new(tosctx);
+       if (!sam_pass) {
+               result = NT_STATUS_NO_MEMORY;
+               goto done;
        }
 
-       become_root();
-       if(!pdb_getsampwnam(sam_pass, user_name)) {
-               unbecome_root();
-               TALLOC_FREE(sam_pass);
-               
-               if ((local_flags & LOCAL_ADD_USER) || (local_flags & LOCAL_DELETE_USER)) {
-                       int tmp_debug = DEBUGLEVEL;
-                       struct passwd *pwd;
-
-                       /* Might not exist in /etc/passwd. */
-
-                       if (tmp_debug < 1) {
-                               DEBUGLEVEL = 1;
-                       }
-
-                       if ( !(pwd = getpwnam_alloc(talloc_autofree_context(), user_name)) ) {
-                               return NT_STATUS_NO_SUCH_USER;
+       /* Get the smb passwd entry for this user */
+       user_exists = pdb_getsampwnam(sam_pass, user_name);
+
+       /* Check delete first, we don't need to do anything else if we
+        * are going to delete the acocunt */
+       if (user_exists && (local_flags & LOCAL_DELETE_USER)) {
+
+               result = pdb_delete_user(tosctx, sam_pass);
+               if (!NT_STATUS_IS_OK(result)) {
+                       ret = asprintf(pp_err_str,
+                                       "Failed to delete entry for user %s.\n",
+                                       user_name);
+                       if (ret < 0) {
+                               *pp_err_str = NULL;
                        }
-
-                       /* create the struct samu and initialize the basic Unix properties */
-
-                       if ( !(sam_pass = samu_new( NULL )) ) {
-                               return NT_STATUS_NO_MEMORY;
+                       result = NT_STATUS_UNSUCCESSFUL;
+               } else {
+                       ret = asprintf(pp_msg_str,
+                                       "Deleted user %s.\n",
+                                       user_name);
+                       if (ret < 0) {
+                               *pp_msg_str = NULL;
                        }
+               }
+               goto done;
+       }
 
-                       result = samu_set_unix( sam_pass, pwd );
-
-                       DEBUGLEVEL = tmp_debug;
+       if (user_exists && (local_flags & LOCAL_ADD_USER)) {
+               /* the entry already existed */
+               local_flags &= ~LOCAL_ADD_USER;
+       }
 
-                       TALLOC_FREE( pwd );
+       if (!user_exists && !(local_flags & LOCAL_ADD_USER)) {
+               ret = asprintf(pp_err_str,
+                               "Failed to find entry for user %s.\n",
+                               user_name);
+               if (ret < 0) {
+                       *pp_err_str = NULL;
+               }
+               result = NT_STATUS_NO_SUCH_USER;
+               goto done;
+       }
 
-                       if (NT_STATUS_EQUAL(result, NT_STATUS_INVALID_PRIMARY_GROUP)) {
-                               return result;
-                       }
+       /* First thing add the new user if we are required to do so */
+       if (local_flags & LOCAL_ADD_USER) {
 
-                       if (!NT_STATUS_IS_OK(result)) {
-                               if (asprintf(pp_err_str, "Failed to " "initialize account for user %s: %s\n",
-                                               user_name, nt_errstr(result)) < 0) {
-                                       *pp_err_str = NULL;
-                               }
-                               return result;
-                       }
+               if (local_flags & LOCAL_TRUST_ACCOUNT) {
+                       acb = ACB_WSTRUST;
+               } else if (local_flags & LOCAL_INTERDOM_ACCOUNT) {
+                       acb = ACB_DOMTRUST;
                } else {
-                       if (asprintf(pp_err_str, "Failed to find entry for user %s.\n", user_name) < 0) {
-                               *pp_err_str = NULL;
-                       }
-                       return NT_STATUS_NO_SUCH_USER;
+                       acb = ACB_NORMAL;
                }
-       } else {
-               unbecome_root();
-               /* the entry already existed */
-               local_flags &= ~LOCAL_ADD_USER;
-       }
 
-       /* the 'other' acb bits not being changed here */
-       other_acb =  (pdb_get_acct_ctrl(sam_pass) & (~(ACB_WSTRUST|ACB_DOMTRUST|ACB_SVRTRUST|ACB_NORMAL)));
-       if (local_flags & LOCAL_TRUST_ACCOUNT) {
-               if (!pdb_set_acct_ctrl(sam_pass, ACB_WSTRUST | other_acb, PDB_CHANGED) ) {
-                       if (asprintf(pp_err_str, "Failed to set 'trusted workstation account' flags for user %s.\n", user_name) < 0) {
+               result = pdb_create_user(tosctx, user_name, acb, &rid);
+               if (!NT_STATUS_IS_OK(result)) {
+                       ret = asprintf(pp_err_str,
+                                       "Failed to add entry for user %s.\n",
+                                       user_name);
+                       if (ret < 0) {
                                *pp_err_str = NULL;
                        }
-                       TALLOC_FREE(sam_pass);
-                       return NT_STATUS_UNSUCCESSFUL;
+                       result = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
                }
-       } else if (local_flags & LOCAL_INTERDOM_ACCOUNT) {
-               if (!pdb_set_acct_ctrl(sam_pass, ACB_DOMTRUST | other_acb, PDB_CHANGED)) {
-                       if (asprintf(pp_err_str, "Failed to set 'domain trust account' flags for user %s.\n", user_name) < 0) {
-                               *pp_err_str = NULL;
-                       }
-                       TALLOC_FREE(sam_pass);
-                       return NT_STATUS_UNSUCCESSFUL;
+
+               sam_pass = samu_new(tosctx);
+               if (!sam_pass) {
+                       result = NT_STATUS_NO_MEMORY;
+                       goto done;
                }
-       } else {
-               if (!pdb_set_acct_ctrl(sam_pass, ACB_NORMAL | other_acb, PDB_CHANGED)) {
-                       if (asprintf(pp_err_str, "Failed to set 'normal account' flags for user %s.\n", user_name) < 0) {
+
+               /* Now get back the smb passwd entry for this new user */
+               user_exists = pdb_getsampwnam(sam_pass, user_name);
+               if (!user_exists) {
+                       ret = asprintf(pp_err_str,
+                                       "Failed to add entry for user %s.\n",
+                                       user_name);
+                       if (ret < 0) {
                                *pp_err_str = NULL;
                        }
-                       TALLOC_FREE(sam_pass);
-                       return NT_STATUS_UNSUCCESSFUL;
+                       result = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
                }
        }
 
+       acb = pdb_get_acct_ctrl(sam_pass);
+
        /*
         * We are root - just write the new password
         * and the valid last change time.
         */
-
-       if (local_flags & LOCAL_DISABLE_USER) {
-               if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)|ACB_DISABLED, PDB_CHANGED)) {
-                       if (asprintf(pp_err_str, "Failed to set 'disabled' flag for user %s.\n", user_name) < 0) {
-                               *pp_err_str = NULL;
-                       }
-                       TALLOC_FREE(sam_pass);
-                       return NT_STATUS_UNSUCCESSFUL;
-               }
-       } else if (local_flags & LOCAL_ENABLE_USER) {
-               if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_DISABLED), PDB_CHANGED)) {
-                       if (asprintf(pp_err_str, "Failed to unset 'disabled' flag for user %s.\n", user_name) < 0) {
+       if ((local_flags & LOCAL_SET_NO_PASSWORD) && !(acb & ACB_PWNOTREQ)) {
+               acb |= ACB_PWNOTREQ;
+               if (!pdb_set_acct_ctrl(sam_pass, acb, PDB_CHANGED)) {
+                       ret = asprintf(pp_err_str,
+                                       "Failed to set 'no password required' "
+                                       "flag for user %s.\n", user_name);
+                       if (ret < 0) {
                                *pp_err_str = NULL;
                        }
-                       TALLOC_FREE(sam_pass);
-                       return NT_STATUS_UNSUCCESSFUL;
+                       result = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
                }
        }
-       
-       if (local_flags & LOCAL_SET_NO_PASSWORD) {
-               if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)|ACB_PWNOTREQ, PDB_CHANGED)) {
-                       if (asprintf(pp_err_str, "Failed to set 'no password required' flag for user %s.\n", user_name) < 0) {
-                               *pp_err_str = NULL;
-                       }
-                       TALLOC_FREE(sam_pass);
-                       return NT_STATUS_UNSUCCESSFUL;
-               }
-       } else if (local_flags & LOCAL_SET_PASSWORD) {
+
+       if (local_flags & LOCAL_SET_PASSWORD) {
                /*
                 * If we're dealing with setting a completely empty user account
                 * ie. One with a password of 'XXXX', but not set disabled (like
@@ -773,83 +778,106 @@ NTSTATUS local_password_change(const char *user_name,
                 * and the decision hasn't really been made to disable them (ie.
                 * don't create them disabled). JRA.
                 */
-               if ((pdb_get_lanman_passwd(sam_pass)==NULL) && (pdb_get_acct_ctrl(sam_pass)&ACB_DISABLED)) {
-                       if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_DISABLED), PDB_CHANGED)) {
-                               if (asprintf(pp_err_str, "Failed to unset 'disabled' flag for user %s.\n", user_name) < 0) {
+               if ((pdb_get_lanman_passwd(sam_pass) == NULL) &&
+                   (acb & ACB_DISABLED)) {
+                       acb &= (~ACB_DISABLED);
+                       if (!pdb_set_acct_ctrl(sam_pass, acb, PDB_CHANGED)) {
+                               ret = asprintf(pp_err_str,
+                                               "Failed to unset 'disabled' "
+                                               "flag for user %s.\n",
+                                               user_name);
+                               if (ret < 0) {
                                        *pp_err_str = NULL;
                                }
-                               TALLOC_FREE(sam_pass);
-                               return NT_STATUS_UNSUCCESSFUL;
+                               result = NT_STATUS_UNSUCCESSFUL;
+                               goto done;
                        }
                }
-               if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_PWNOTREQ), PDB_CHANGED)) {
-                       if (asprintf(pp_err_str, "Failed to unset 'no password required' flag for user %s.\n", user_name) < 0) {
-                               *pp_err_str = NULL;
-                       }
-                       TALLOC_FREE(sam_pass);
-                       return NT_STATUS_UNSUCCESSFUL;
-               }
-               
-               if (!pdb_set_plaintext_passwd (sam_pass, new_passwd)) {
-                       if (asprintf(pp_err_str, "Failed to set password for user %s.\n", user_name) < 0) {
+
+               acb &= (~ACB_PWNOTREQ);
+               if (!pdb_set_acct_ctrl(sam_pass, acb, PDB_CHANGED)) {
+                       ret = asprintf(pp_err_str,
+                                       "Failed to unset 'no password required'"
+                                       " flag for user %s.\n", user_name);
+                       if (ret < 0) {
                                *pp_err_str = NULL;
                        }
-                       TALLOC_FREE(sam_pass);
-                       return NT_STATUS_UNSUCCESSFUL;
+                       result = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
                }
-       }       
 
-       if (local_flags & LOCAL_ADD_USER) {
-               if (NT_STATUS_IS_OK(pdb_add_sam_account(sam_pass))) {
-                       if (asprintf(pp_msg_str, "Added user %s.\n", user_name) < 0) {
-                               *pp_msg_str = NULL;
-                       }
-                       TALLOC_FREE(sam_pass);
-                       return NT_STATUS_OK;
-               } else {
-                       if (asprintf(pp_err_str, "Failed to add entry for user %s.\n", user_name) < 0) {
+               if (!pdb_set_plaintext_passwd(sam_pass, new_passwd)) {
+                       ret = asprintf(pp_err_str,
+                                       "Failed to set password for "
+                                       "user %s.\n", user_name);
+                               if (ret < 0) {
                                *pp_err_str = NULL;
                        }
-                       TALLOC_FREE(sam_pass);
-                       return NT_STATUS_UNSUCCESSFUL;
+                       result = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
                }
-       } else if (local_flags & LOCAL_DELETE_USER) {
-               if (!NT_STATUS_IS_OK(pdb_delete_sam_account(sam_pass))) {
-                       if (asprintf(pp_err_str, "Failed to delete entry for user %s.\n", user_name) < 0) {
+       }
+
+       if ((local_flags & LOCAL_DISABLE_USER) && !(acb & ACB_DISABLED)) {
+               acb |= ACB_DISABLED;
+               if (!pdb_set_acct_ctrl(sam_pass, acb, PDB_CHANGED)) {
+                       ret = asprintf(pp_err_str,
+                                       "Failed to set 'disabled' flag for "
+                                       "user %s.\n", user_name);
+                       if (ret < 0) {
                                *pp_err_str = NULL;
                        }
-                       TALLOC_FREE(sam_pass);
-                       return NT_STATUS_UNSUCCESSFUL;
-               }
-               if (asprintf(pp_msg_str, "Deleted user %s.\n", user_name) < 0) {
-                       *pp_msg_str = NULL;
+                       result = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
                }
-       } else {
-               result = pdb_update_sam_account(sam_pass);
-               if(!NT_STATUS_IS_OK(result)) {
-                       if (asprintf(pp_err_str, "Failed to modify entry for user %s.\n", user_name) < 0) {
+       }
+
+       if ((local_flags & LOCAL_ENABLE_USER) && (acb & ACB_DISABLED)) {
+               acb &= (~ACB_DISABLED);
+               if (!pdb_set_acct_ctrl(sam_pass, acb, PDB_CHANGED)) {
+                       ret = asprintf(pp_err_str,
+                                       "Failed to unset 'disabled' flag for "
+                                       "user %s.\n", user_name);
+                       if (ret < 0) {
                                *pp_err_str = NULL;
                        }
-                       TALLOC_FREE(sam_pass);
-                       return result;
+                       result = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
                }
-               if(local_flags & LOCAL_DISABLE_USER) {
-                       if (asprintf(pp_msg_str, "Disabled user %s.\n", user_name) < 0) {
-                               *pp_msg_str = NULL;
-                       }
-               } else if (local_flags & LOCAL_ENABLE_USER) {
-                       if (asprintf(pp_msg_str, "Enabled user %s.\n", user_name) < 0) {
-                               *pp_msg_str = NULL;
-                       }
-               } else if (local_flags & LOCAL_SET_NO_PASSWORD) {
-                       if (asprintf(pp_msg_str, "User %s password set to none.\n", user_name) < 0) {
-                               *pp_msg_str = NULL;
-                       }
+       }
+
+       /* now commit changes if any */
+       result = pdb_update_sam_account(sam_pass);
+       if (!NT_STATUS_IS_OK(result)) {
+               ret = asprintf(pp_err_str,
+                               "Failed to modify entry for user %s.\n",
+                               user_name);
+               if (ret < 0) {
+                       *pp_err_str = NULL;
                }
+               goto done;
+       }
+
+       if (local_flags & LOCAL_ADD_USER) {
+               ret = asprintf(pp_msg_str, "Added user %s.\n", user_name);
+       } else if (local_flags & LOCAL_DISABLE_USER) {
+               ret = asprintf(pp_msg_str, "Disabled user %s.\n", user_name);
+       } else if (local_flags & LOCAL_ENABLE_USER) {
+               ret = asprintf(pp_msg_str, "Enabled user %s.\n", user_name);
+       } else if (local_flags & LOCAL_SET_NO_PASSWORD) {
+               ret = asprintf(pp_msg_str,
+                               "User %s password set to none.\n", user_name);
        }
 
+       if (ret < 0) {
+               *pp_msg_str = NULL;
+       }
+
+       result = NT_STATUS_OK;
+
+done:
        TALLOC_FREE(sam_pass);
-       return NT_STATUS_OK;
+       return result;
 }
 
 /**********************************************************************
@@ -860,6 +888,7 @@ NTSTATUS local_password_change(const char *user_name,
 #define SAMU_BUFFER_FORMAT_V1       "dddddddBBBBBBBBBBBBddBBwdwdBwwd"
 #define SAMU_BUFFER_FORMAT_V2       "dddddddBBBBBBBBBBBBddBBBwwdBwwd"
 #define SAMU_BUFFER_FORMAT_V3       "dddddddBBBBBBBBBBBBddBBBdwdBwwd"
+/* nothing changed between V3 and V4 */
 
 /*********************************************************************
 *********************************************************************/
@@ -892,7 +921,7 @@ static bool init_samu_from_buffer_v0(struct samu *sampass, uint8 *buf, uint32 bu
                dir_drive_len, unknown_str_len, munged_dial_len,
                fullname_len, homedir_len, logon_script_len,
                profile_path_len, acct_desc_len, workstations_len;
-               
+
        uint32  user_rid, group_rid, remove_me, hours_len, unknown_6;
        uint16  acct_ctrl, logon_divs;
        uint16  bad_password_count, logon_count;
@@ -901,7 +930,7 @@ static bool init_samu_from_buffer_v0(struct samu *sampass, uint8 *buf, uint32 bu
        uint32          len = 0;
        uint32          lm_pw_len, nt_pw_len, hourslen;
        bool ret = True;
-       
+
        if(sampass == NULL || buf == NULL) {
                DEBUG(0, ("init_samu_from_buffer_v0: NULL parameters found!\n"));
                return False;
@@ -941,7 +970,7 @@ static bool init_samu_from_buffer_v0(struct samu *sampass, uint8 *buf, uint32 bu
                &bad_password_count,                                    /* w */
                &logon_count,                                           /* w */
                &unknown_6);                                            /* d */
-               
+
        if (len == (uint32) -1)  {
                ret = False;
                goto done;
@@ -986,7 +1015,7 @@ static bool init_samu_from_buffer_v0(struct samu *sampass, uint8 *buf, uint32 bu
                                         lp_logon_script()),
                        PDB_DEFAULT);
        }
-       
+
        if (profile_path) {     
                pdb_set_profile_path(sampass, profile_path, PDB_SET);
        } else {
@@ -1078,7 +1107,7 @@ static bool init_samu_from_buffer_v1(struct samu *sampass, uint8 *buf, uint32 bu
                dir_drive_len, unknown_str_len, munged_dial_len,
                fullname_len, homedir_len, logon_script_len,
                profile_path_len, acct_desc_len, workstations_len;
-               
+
        uint32  user_rid, group_rid, remove_me, hours_len, unknown_6;
        uint16  acct_ctrl, logon_divs;
        uint16  bad_password_count, logon_count;
@@ -1087,7 +1116,7 @@ static bool init_samu_from_buffer_v1(struct samu *sampass, uint8 *buf, uint32 bu
        uint32          len = 0;
        uint32          lm_pw_len, nt_pw_len, hourslen;
        bool ret = True;
-       
+
        if(sampass == NULL || buf == NULL) {
                DEBUG(0, ("init_samu_from_buffer_v1: NULL parameters found!\n"));
                return False;
@@ -1129,7 +1158,7 @@ static bool init_samu_from_buffer_v1(struct samu *sampass, uint8 *buf, uint32 bu
                &bad_password_count,                                    /* w */
                &logon_count,                                           /* w */
                &unknown_6);                                            /* d */
-               
+
        if (len == (uint32) -1)  {
                ret = False;
                goto done;
@@ -1177,7 +1206,7 @@ static bool init_samu_from_buffer_v1(struct samu *sampass, uint8 *buf, uint32 bu
                                         lp_logon_script()),
                        PDB_DEFAULT);
        }
-       
+
        if (profile_path) {     
                pdb_set_profile_path(sampass, profile_path, PDB_SET);
        } else {
@@ -1267,7 +1296,7 @@ static bool init_samu_from_buffer_v2(struct samu *sampass, uint8 *buf, uint32 bu
                dir_drive_len, unknown_str_len, munged_dial_len,
                fullname_len, homedir_len, logon_script_len,
                profile_path_len, acct_desc_len, workstations_len;
-               
+
        uint32  user_rid, group_rid, hours_len, unknown_6;
        uint16  acct_ctrl, logon_divs;
        uint16  bad_password_count, logon_count;
@@ -1279,12 +1308,12 @@ static bool init_samu_from_buffer_v2(struct samu *sampass, uint8 *buf, uint32 bu
        bool ret = True;
        fstring tmp_string;
        bool expand_explicit = lp_passdb_expand_explicit();
-       
+
        if(sampass == NULL || buf == NULL) {
                DEBUG(0, ("init_samu_from_buffer_v2: NULL parameters found!\n"));
                return False;
        }
-                                                                       
+
 /* SAMU_BUFFER_FORMAT_V2       "dddddddBBBBBBBBBBBBddBBBwwdBwwd" */
 
        /* unpack the buffer into variables */
@@ -1322,7 +1351,7 @@ static bool init_samu_from_buffer_v2(struct samu *sampass, uint8 *buf, uint32 bu
                &bad_password_count,                                    /* w */
                &logon_count,                                           /* w */
                &unknown_6);                                            /* d */
-               
+
        if (len == (uint32) -1)  {
                ret = False;
                goto done;
@@ -1375,7 +1404,7 @@ static bool init_samu_from_buffer_v2(struct samu *sampass, uint8 *buf, uint32 bu
                                         lp_logon_script()),
                        PDB_DEFAULT);
        }
-       
+
        if (profile_path) {     
                fstrcpy( tmp_string, profile_path );
                if (expand_explicit) {
@@ -1502,7 +1531,7 @@ static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 bu
                dir_drive_len, unknown_str_len, munged_dial_len,
                fullname_len, homedir_len, logon_script_len,
                profile_path_len, acct_desc_len, workstations_len;
-               
+
        uint32  user_rid, group_rid, hours_len, unknown_6, acct_ctrl;
        uint16  logon_divs;
        uint16  bad_password_count, logon_count;
@@ -1514,12 +1543,12 @@ static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 bu
        bool ret = True;
        fstring tmp_string;
        bool expand_explicit = lp_passdb_expand_explicit();
-       
+
        if(sampass == NULL || buf == NULL) {
                DEBUG(0, ("init_samu_from_buffer_v3: NULL parameters found!\n"));
                return False;
        }
-                                                                       
+
 /* SAMU_BUFFER_FORMAT_V3       "dddddddBBBBBBBBBBBBddBBBdwdBwwd" */
 
        /* unpack the buffer into variables */
@@ -1558,7 +1587,7 @@ static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 bu
                &bad_password_count,                                    /* w */
                &logon_count,                                           /* w */
                &unknown_6);                                            /* d */
-               
+
        if (len == (uint32) -1)  {
                ret = False;
                goto done;
@@ -1611,7 +1640,7 @@ static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 bu
                                         lp_logon_script()),
                        PDB_DEFAULT);
        }
-       
+
        if (profile_path) {     
                fstrcpy( tmp_string, profile_path );
                if (expand_explicit) {
@@ -1838,12 +1867,12 @@ static uint32 init_buffer_from_samu_v3 (uint8 **buf, struct samu *sampass, bool
        } else {
                profile_path_len = 0;
        }
-       
+
        lm_pw = pdb_get_lanman_passwd(sampass);
        if (!lm_pw) {
                lm_pw_len = 0;
        }
-       
+
        nt_pw = pdb_get_nt_passwd(sampass);
        if (!nt_pw) {
                nt_pw_len = 0;
@@ -1926,7 +1955,7 @@ static uint32 init_buffer_from_samu_v3 (uint8 **buf, struct samu *sampass, bool
                DEBUG(0,("init_buffer_from_samu_v3: Unable to malloc() memory for buffer!\n"));
                return (-1);
        }
-       
+
        /* now for the real call to tdb_pack() */
        buflen = tdb_pack(*buf, len,  SAMU_BUFFER_FORMAT_V3,
                logon_time,                             /* d */
@@ -1960,7 +1989,7 @@ static uint32 init_buffer_from_samu_v3 (uint8 **buf, struct samu *sampass, bool
                pdb_get_bad_password_count(sampass),    /* w */
                pdb_get_logon_count(sampass),           /* w */
                pdb_get_unknown_6(sampass));            /* d */
-       
+
        /* check to make sure we got it correct */
        if (buflen != len) {
                DEBUG(0, ("init_buffer_from_samu_v3: somthing odd is going on here: bufflen (%lu) != len (%lu) in tdb_pack operations!\n", 
@@ -1973,6 +2002,18 @@ static uint32 init_buffer_from_samu_v3 (uint8 **buf, struct samu *sampass, bool
        return (buflen);
 }
 
+static bool init_samu_from_buffer_v4(struct samu *sampass, uint8 *buf, uint32 buflen)
+{
+       /* nothing changed between V3 and V4 */
+       return init_samu_from_buffer_v3(sampass, buf, buflen);
+}
+
+static uint32 init_buffer_from_samu_v4(uint8 **buf, struct samu *sampass, bool size_only)
+{
+       /* nothing changed between V3 and V4 */
+       return init_buffer_from_samu_v3(buf, sampass, size_only);
+}
+
 /**********************************************************************
  Intialize a struct samu struct from a BYTE buffer of size len
  *********************************************************************/
@@ -1989,6 +2030,8 @@ bool init_samu_from_buffer(struct samu *sampass, uint32_t level,
                return init_samu_from_buffer_v2(sampass, buf, buflen);
        case SAMU_BUFFER_V3:
                return init_samu_from_buffer_v3(sampass, buf, buflen);
+       case SAMU_BUFFER_V4:
+               return init_samu_from_buffer_v4(sampass, buf, buflen);
        }
 
        return false;
@@ -2000,7 +2043,7 @@ bool init_samu_from_buffer(struct samu *sampass, uint32_t level,
 
 uint32 init_buffer_from_samu (uint8 **buf, struct samu *sampass, bool size_only)
 {
-       return init_buffer_from_samu_v3(buf, sampass, size_only);
+       return init_buffer_from_samu_v4(buf, sampass, size_only);
 }
 
 /*********************************************************************
@@ -2023,7 +2066,7 @@ bool pdb_copy_sam_account(struct samu *dst, struct samu *src )
        }
 
        dst->methods = src->methods;
-       
+
        if ( src->unix_pw ) {
                dst->unix_pw = tcopy_passwd( dst, src->unix_pw );
                if (!dst->unix_pw) {
@@ -2112,7 +2155,7 @@ bool pdb_update_autolock_flag(struct samu *sampass, bool *updated)
                DEBUG(9, ("pdb_update_autolock_flag: No reset duration, can't reset autolock\n"));
                return True;
        }
-                     
+
        LastBadPassword = pdb_get_bad_password_time(sampass);
        DEBUG(7, ("pdb_update_autolock_flag: Account %s, LastBadPassword=%d, duration=%d, current time =%d.\n",
                  pdb_get_username(sampass), (uint32)LastBadPassword, duration*60, (uint32)time(NULL)));
@@ -2135,7 +2178,7 @@ bool pdb_update_autolock_flag(struct samu *sampass, bool *updated)
                        *updated = True;
                }
        }
-       
+
        return True;
 }
 
@@ -2334,4 +2377,3 @@ struct samr_LogonHours get_logon_hours_from_pdb(TALLOC_CTX *mem_ctx,
 
        return hours;
 }
-