set ACB_PWNOEXP by default on new accounts.

(This used to be commit ead3d41f1a8293bcd2062af918b58022f4d9b10e)

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 96c11de73abc73f146e0dfa2d030f20f5c651e04..86ee97d281b76a5832887369ecefb4157ea4c7bf 100644 (file)
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -878,8 +878,8 @@ account without a valid local system user.\n", user_name);
                        return False;
                }
 
-               /* set account flags */
-               if (!pdb_set_acct_ctrl(sam_pass,((local_flags & LOCAL_TRUST_ACCOUNT) ? ACB_WSTRUST : ACB_NORMAL) )) {
+               /* set account flags. Note that the default is non-expiring accounts */
+               if (!pdb_set_acct_ctrl(sam_pass,((local_flags & LOCAL_TRUST_ACCOUNT) ? ACB_WSTRUST : ACB_NORMAL|ACB_PWNOEXP) )) {
                        slprintf(err_str, err_str_len-1, "Failed to set 'trust account' flags for user %s.\n", user_name);
                        pdb_free_sam(&sam_pass);
                        return False;