s3-samr: support some more info levels in samr_SetUserInfo calls.
[ira/wip.git] / source3 / rpc_server / srv_samr_util.c
index d7ead0d15fd9716e7c59f6ed756a4627da66fc82..5dad3bdc70bb84b6d4fe488e972db0b5d5acd92d 100644 (file)
@@ -1,25 +1,25 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    SAMR Pipe utility functions.
-   
+
    Copyright (C) Luke Kenneth Casson Leighton  1996-1998
    Copyright (C) Gerald (Jerry) Carter         2000-2001
    Copyright (C) Andrew Bartlett               2001-2002
    Copyright (C) Stefan (metze) Metzmacher     2002
-      
+   Copyright (C) Guenther Deschner             2008
+
    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,
    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, 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"
                    (!old_string && new_string) ||\
                (old_string && new_string && (strcmp(old_string, new_string) != 0))
 
+#define STRING_CHANGED_NC(s1,s2) ((s1) && !(s2)) ||\
+                   (!(s1) && (s2)) ||\
+               ((s1) && (s2) && (strcmp((s1), (s2)) != 0))
+
 /*************************************************************
- Copies a SAM_USER_INFO_21 to a SAM_ACCOUNT
+ Copies a struct samr_UserInfo2 to a struct samu
 **************************************************************/
 
-void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
+void copy_id2_to_sam_passwd(struct samu *to,
+                           struct samr_UserInfo2 *from)
 {
-       time_t unix_time, stored_time;
-       const char *old_string, *new_string;
+       struct samr_UserInfo21 i;
 
-       if (from == NULL || to == NULL) 
+       if (from == NULL || to == NULL) {
                return;
-       if (!nt_time_is_zero(&from->logon_time)) {
-               unix_time=nt_time_to_unix(&from->logon_time);
-               stored_time = pdb_get_logon_time(to);
-               DEBUG(10,("INFO_21 LOGON_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
-               if (stored_time != unix_time) 
-                       pdb_set_logon_time(to, unix_time, PDB_CHANGED);
-       }       
-       if (!nt_time_is_zero(&from->logoff_time)) {
-               unix_time=nt_time_to_unix(&from->logoff_time);
-               stored_time = pdb_get_logoff_time(to);
-               DEBUG(10,("INFO_21 LOGOFF_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
-               if (stored_time != unix_time) 
-                       pdb_set_logoff_time(to, unix_time, PDB_CHANGED);
        }
-       
-       if (!nt_time_is_zero(&from->kickoff_time)) {
-               unix_time=nt_time_to_unix(&from->kickoff_time);
-               stored_time = pdb_get_kickoff_time(to);
-               DEBUG(10,("INFO_21 KICKOFF_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
-               if (stored_time != unix_time) 
-                       pdb_set_kickoff_time(to, unix_time , PDB_CHANGED);
-       }       
 
-       if (!nt_time_is_zero(&from->pass_can_change_time)) {
-               unix_time=nt_time_to_unix(&from->pass_can_change_time);
-               stored_time = pdb_get_pass_can_change_time(to);
-               DEBUG(10,("INFO_21 PASS_CAN_CH: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
-               if (stored_time != unix_time) 
-                       pdb_set_pass_can_change_time(to, unix_time, PDB_CHANGED);
-       }
-       if (!nt_time_is_zero(&from->pass_last_set_time)) {
-               unix_time=nt_time_to_unix(&from->pass_last_set_time);
-               stored_time = pdb_get_pass_last_set_time(to);
-               DEBUG(10,("INFO_21 PASS_LAST_SET: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
-               if (stored_time != unix_time) 
-                       pdb_set_pass_last_set_time(to, unix_time, PDB_CHANGED);
-       }
+       ZERO_STRUCT(i);
 
-       if (!nt_time_is_zero(&from->pass_must_change_time)) {
-               unix_time=nt_time_to_unix(&from->pass_must_change_time);
-               stored_time=pdb_get_pass_must_change_time(to);
-               DEBUG(10,("INFO_21 PASS_MUST_CH: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
-               if (stored_time != unix_time) 
-                       pdb_set_pass_must_change_time(to, unix_time, PDB_CHANGED);
-       }
+       i.fields_present        = SAMR_FIELD_COMMENT |
+                                 SAMR_FIELD_COUNTRY_CODE |
+                                 SAMR_FIELD_CODE_PAGE;
+       i.comment               = from->comment;
+       i.country_code          = from->country_code;
+       i.code_page             = from->code_page;
 
-       /* Backend should check this for sainity */
-       if (from->hdr_user_name.buffer) {
-               old_string = pdb_get_username(to);
-               new_string = unistr2_static(&from->uni_user_name);
-               DEBUG(10,("INFO_21 UNI_USER_NAME: %s -> %s\n", old_string, new_string));
-               if (STRING_CHANGED)
-                   pdb_set_username(to      , new_string, PDB_CHANGED);
-       }
+       copy_id21_to_sam_passwd("INFO_2", to, &i);
+}
 
-       if (from->hdr_full_name.buffer) {
-               old_string = pdb_get_fullname(to);
-               new_string = unistr2_static(&from->uni_full_name);
-               DEBUG(10,("INFO_21 UNI_FULL_NAME: %s -> %s\n",old_string, new_string));
-               if (STRING_CHANGED)
-                       pdb_set_fullname(to      , new_string, PDB_CHANGED);
-       }
-       
-       if (from->hdr_home_dir.buffer) {
-               old_string = pdb_get_homedir(to);
-               new_string = unistr2_static(&from->uni_home_dir);
-               DEBUG(10,("INFO_21 UNI_HOME_DIR: %s -> %s\n",old_string,new_string));
-               if (STRING_CHANGED)
-                       pdb_set_homedir(to       , new_string, PDB_CHANGED);
-       }
+/*************************************************************
+ Copies a struct samr_UserInfo4 to a struct samu
+**************************************************************/
 
-       if (from->hdr_dir_drive.buffer) {
-               old_string = pdb_get_dir_drive(to);
-               new_string = unistr2_static(&from->uni_dir_drive);
-               DEBUG(10,("INFO_21 UNI_DIR_DRIVE: %s -> %s\n",old_string,new_string));
-               if (STRING_CHANGED)
-                       pdb_set_dir_drive(to     , new_string, PDB_CHANGED);
-       }
+void copy_id4_to_sam_passwd(struct samu *to,
+                           struct samr_UserInfo4 *from)
+{
+       struct samr_UserInfo21 i;
 
-       if (from->hdr_logon_script.buffer) {
-               old_string = pdb_get_logon_script(to);
-               new_string = unistr2_static(&from->uni_logon_script);
-               DEBUG(10,("INFO_21 UNI_LOGON_SCRIPT: %s -> %s\n",old_string,new_string));
-               if (STRING_CHANGED)
-                       pdb_set_logon_script(to  , new_string, PDB_CHANGED);
+       if (from == NULL || to == NULL) {
+               return;
        }
 
-       if (from->hdr_profile_path.buffer) {
-               old_string = pdb_get_profile_path(to);
-               new_string = unistr2_static(&from->uni_profile_path);
-               DEBUG(10,("INFO_21 UNI_PROFILE_PATH: %s -> %s\n",old_string, new_string));
-               if (STRING_CHANGED)
-                       pdb_set_profile_path(to  , new_string, PDB_CHANGED);
-       }
-       
-       if (from->hdr_acct_desc.buffer) {
-               old_string = pdb_get_acct_desc(to);
-               new_string = unistr2_static(&from->uni_acct_desc);
-               DEBUG(10,("INFO_21 UNI_ACCT_DESC: %s -> %s\n",old_string,new_string));
-               if (STRING_CHANGED)
-                       pdb_set_acct_desc(to     , new_string, PDB_CHANGED);
-       }
-       
-       if (from->hdr_workstations.buffer) {
-               old_string = pdb_get_workstations(to);
-               new_string = unistr2_static(&from->uni_workstations);
-               DEBUG(10,("INFO_21 UNI_WORKSTATIONS: %s -> %s\n",old_string, new_string));
-               if (STRING_CHANGED)
-                       pdb_set_workstations(to  , new_string, PDB_CHANGED);
-       }
+       ZERO_STRUCT(i);
 
-       if (from->hdr_unknown_str.buffer) {
-               old_string = pdb_get_unknown_str(to);
-               new_string = unistr2_static(&from->uni_unknown_str);
-               DEBUG(10,("INFO_21 UNI_UNKNOWN_STR: %s -> %s\n",old_string, new_string));
-               if (STRING_CHANGED)
-                       pdb_set_unknown_str(to   , new_string, PDB_CHANGED);
-       }
-       
-       if (from->hdr_munged_dial.buffer) {
-               old_string = pdb_get_munged_dial(to);
-               new_string = unistr2_static(&from->uni_munged_dial);
-               DEBUG(10,("INFO_21 UNI_MUNGED_DIAL: %s -> %s\n",old_string, new_string));
-               if (STRING_CHANGED)
-                       pdb_set_munged_dial(to   , new_string, PDB_CHANGED);
-       }
-       
-       if (from->user_rid != pdb_get_user_rid(to)) {
-               DEBUG(10,("INFO_21 USER_RID: %u -> %u NOT UPDATED!\n",pdb_get_user_rid(to),from->user_rid));
-               /* we really allow this ??? metze */
-               /* pdb_set_user_sid_from_rid(to, from->user_rid, PDB_CHANGED);*/
+       i.fields_present        = SAMR_FIELD_LOGON_HOURS;
+       i.logon_hours           = from->logon_hours;
+
+       copy_id21_to_sam_passwd("INFO_4", to, &i);
+}
+
+/*************************************************************
+ Copies a struct samr_UserInfo6 to a struct samu
+**************************************************************/
+
+void copy_id6_to_sam_passwd(struct samu *to,
+                           struct samr_UserInfo6 *from)
+{
+       struct samr_UserInfo21 i;
+
+       if (from == NULL || to == NULL) {
+               return;
        }
-       
-       if (from->group_rid != pdb_get_group_rid(to)) {
-               DEBUG(10,("INFO_21 GROUP_RID: %u -> %u\n",pdb_get_group_rid(to),from->group_rid));
-               pdb_set_group_sid_from_rid(to, from->group_rid, PDB_CHANGED);
+
+       ZERO_STRUCT(i);
+
+       i.fields_present        = SAMR_FIELD_ACCOUNT_NAME |
+                                 SAMR_FIELD_FULL_NAME;
+       i.account_name          = from->account_name;
+       i.full_name             = from->full_name;
+
+       copy_id21_to_sam_passwd("INFO_6", to, &i);
+}
+
+/*************************************************************
+ Copies a struct samr_UserInfo8 to a struct samu
+**************************************************************/
+
+void copy_id8_to_sam_passwd(struct samu *to,
+                           struct samr_UserInfo8 *from)
+{
+       struct samr_UserInfo21 i;
+
+       if (from == NULL || to == NULL) {
+               return;
        }
-       
-       DEBUG(10,("INFO_21 ACCT_CTRL: %08X -> %08X\n",pdb_get_acct_ctrl(to),from->acb_info));
-       if (from->acb_info != pdb_get_acct_ctrl(to)) {
-               pdb_set_acct_ctrl(to, from->acb_info, PDB_CHANGED);
+
+       ZERO_STRUCT(i);
+
+       i.fields_present        = SAMR_FIELD_FULL_NAME;
+       i.full_name             = from->full_name;
+
+       copy_id21_to_sam_passwd("INFO_8", to, &i);
+}
+
+/*************************************************************
+ Copies a struct samr_UserInfo10 to a struct samu
+**************************************************************/
+
+void copy_id10_to_sam_passwd(struct samu *to,
+                            struct samr_UserInfo10 *from)
+{
+       struct samr_UserInfo21 i;
+
+       if (from == NULL || to == NULL) {
+               return;
        }
 
-       DEBUG(10,("INFO_21 UNKOWN_3: %08X -> %08X\n",pdb_get_unknown_3(to),from->unknown_3));
-       if (from->unknown_3 != pdb_get_unknown_3(to)) {
-               pdb_set_unknown_3(to, from->unknown_3, PDB_CHANGED);
+       ZERO_STRUCT(i);
+
+       i.fields_present        = SAMR_FIELD_HOME_DIRECTORY |
+                                 SAMR_FIELD_HOME_DRIVE;
+       i.home_directory        = from->home_directory;
+       i.home_drive            = from->home_drive;
+
+       copy_id21_to_sam_passwd("INFO_10", to, &i);
+}
+
+/*************************************************************
+ Copies a struct samr_UserInfo11 to a struct samu
+**************************************************************/
+
+void copy_id11_to_sam_passwd(struct samu *to,
+                            struct samr_UserInfo11 *from)
+{
+       struct samr_UserInfo21 i;
+
+       if (from == NULL || to == NULL) {
+               return;
        }
 
-       DEBUG(15,("INFO_21 LOGON_DIVS: %08X -> %08X\n",pdb_get_logon_divs(to),from->logon_divs));
-       if (from->logon_divs != pdb_get_logon_divs(to)) {
-               pdb_set_logon_divs(to, from->logon_divs, PDB_CHANGED);
+       ZERO_STRUCT(i);
+
+       i.fields_present        = SAMR_FIELD_LOGON_SCRIPT;
+       i.logon_script          = from->logon_script;
+
+       copy_id21_to_sam_passwd("INFO_11", to, &i);
+}
+
+/*************************************************************
+ Copies a struct samr_UserInfo12 to a struct samu
+**************************************************************/
+
+void copy_id12_to_sam_passwd(struct samu *to,
+                            struct samr_UserInfo12 *from)
+{
+       struct samr_UserInfo21 i;
+
+       if (from == NULL || to == NULL) {
+               return;
        }
 
-       DEBUG(15,("INFO_21 LOGON_HRS.LEN: %08X -> %08X\n",pdb_get_hours_len(to),from->logon_hrs.len));
-       if (from->logon_hrs.len != pdb_get_hours_len(to)) {
-               pdb_set_hours_len(to, from->logon_hrs.len, PDB_CHANGED);
+       ZERO_STRUCT(i);
+
+       i.fields_present        = SAMR_FIELD_PROFILE_PATH;
+       i.profile_path          = from->profile_path;
+
+       copy_id21_to_sam_passwd("INFO_12", to, &i);
+}
+
+/*************************************************************
+ Copies a struct samr_UserInfo13 to a struct samu
+**************************************************************/
+
+void copy_id13_to_sam_passwd(struct samu *to,
+                            struct samr_UserInfo13 *from)
+{
+       struct samr_UserInfo21 i;
+
+       if (from == NULL || to == NULL) {
+               return;
        }
 
-       DEBUG(15,("INFO_21 LOGON_HRS.HOURS: %s -> %s\n",pdb_get_hours(to),from->logon_hrs.hours));
-/* Fix me: only update if it changes --metze */
-       pdb_set_hours(to, from->logon_hrs.hours, PDB_CHANGED);
+       ZERO_STRUCT(i);
+
+       i.fields_present        = SAMR_FIELD_DESCRIPTION;
+       i.description           = from->description;
 
-       DEBUG(10,("INFO_21 UNKOWN_5: %08X -> %08X\n",pdb_get_unknown_5(to),from->unknown_5));
-       if (from->unknown_5 != pdb_get_unknown_5(to)) {
-               pdb_set_unknown_5(to, from->unknown_5, PDB_CHANGED);
+       copy_id21_to_sam_passwd("INFO_13", to, &i);
+}
+
+/*************************************************************
+ Copies a struct samr_UserInfo14 to a struct samu
+**************************************************************/
+
+void copy_id14_to_sam_passwd(struct samu *to,
+                            struct samr_UserInfo14 *from)
+{
+       struct samr_UserInfo21 i;
+
+       if (from == NULL || to == NULL) {
+               return;
        }
 
-       DEBUG(10,("INFO_21 UNKOWN_6: %08X -> %08X\n",pdb_get_unknown_6(to),from->unknown_6));
-       if (from->unknown_6 != pdb_get_unknown_6(to)) {
-               pdb_set_unknown_6(to, from->unknown_6, PDB_CHANGED);
+       ZERO_STRUCT(i);
+
+       i.fields_present        = SAMR_FIELD_WORKSTATIONS;
+       i.workstations          = from->workstations;
+
+       copy_id21_to_sam_passwd("INFO_14", to, &i);
+}
+
+/*************************************************************
+ Copies a struct samr_UserInfo17 to a struct samu
+**************************************************************/
+
+void copy_id17_to_sam_passwd(struct samu *to,
+                            struct samr_UserInfo17 *from)
+{
+       struct samr_UserInfo21 i;
+
+       if (from == NULL || to == NULL) {
+               return;
        }
 
-       DEBUG(10,("INFO_21 PADDING1 %02X %02X %02X %02X %02X %02X\n",
-                 from->padding1[0],
-                 from->padding1[1],
-                 from->padding1[2],
-                 from->padding1[3],
-                 from->padding1[4],
-                 from->padding1[5]));
+       ZERO_STRUCT(i);
 
-       DEBUG(10,("INFO_21 PASS_MUST_CHANGE_AT_NEXT_LOGON: %02X\n",from->passmustchange));
-       if (from->passmustchange==PASS_MUST_CHANGE_AT_NEXT_LOGON) {
-               pdb_set_pass_must_change_time(to,0, PDB_CHANGED);               
+       i.fields_present        = SAMR_FIELD_ACCT_EXPIRY;
+       i.acct_expiry           = from->acct_expiry;
+
+       copy_id21_to_sam_passwd("INFO_17", to, &i);
+}
+
+/*************************************************************
+ Copies a struct samr_UserInfo18 to a struct samu
+**************************************************************/
+
+void copy_id18_to_sam_passwd(struct samu *to,
+                            struct samr_UserInfo18 *from)
+{
+       struct samr_UserInfo21 i;
+
+       if (from == NULL || to == NULL) {
+               return;
        }
 
-       DEBUG(10,("INFO_21 PADDING_2: %02X\n",from->padding2));
+       ZERO_STRUCT(i);
 
-       DEBUG(10,("INFO_21 PADDING_4: %08X\n",from->padding4));
+       i.fields_present        = SAMR_FIELD_EXPIRED_FLAG;
+       i.password_expired      = from->password_expired;
+
+       copy_id21_to_sam_passwd("INFO_18", to, &i);
 }
 
+/*************************************************************
+ Copies a struct samr_UserInfo20 to a struct samu
+**************************************************************/
+
+void copy_id20_to_sam_passwd(struct samu *to,
+                            struct samr_UserInfo20 *from)
+{
+       const char *old_string;
+       char *new_string;
+       DATA_BLOB mung;
+
+       if (from == NULL || to == NULL) {
+               return;
+       }
+
+       if (from->parameters.array) {
+               old_string = pdb_get_munged_dial(to);
+               mung = data_blob_const(from->parameters.array,
+                                      from->parameters.length);
+               new_string = (mung.length == 0) ?
+                       NULL : base64_encode_data_blob(talloc_tos(), mung);
+               DEBUG(10,("INFO_20 PARAMETERS: %s -> %s\n",
+                       old_string, new_string));
+               if (STRING_CHANGED_NC(old_string,new_string)) {
+                       pdb_set_munged_dial(to, new_string, PDB_CHANGED);
+               }
+
+               TALLOC_FREE(new_string);
+       }
+}
 
 /*************************************************************
- Copies a SAM_USER_INFO_23 to a SAM_ACCOUNT
+ Copies a struct samr_UserInfo21 to a struct samu
 **************************************************************/
 
-void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
+void copy_id21_to_sam_passwd(const char *log_prefix,
+                            struct samu *to,
+                            struct samr_UserInfo21 *from)
 {
        time_t unix_time, stored_time;
        const char *old_string, *new_string;
+       const char *l;
 
-       if (from == NULL || to == NULL) 
+       if (from == NULL || to == NULL) {
                return;
-       if (!nt_time_is_zero(&from->logon_time)) {
-               unix_time=nt_time_to_unix(&from->logon_time);
+       }
+
+       if (log_prefix) {
+               l = log_prefix;
+       } else {
+               l = "INFO_21";
+       }
+
+       if (from->fields_present & SAMR_FIELD_LAST_LOGON) {
+               unix_time = nt_time_to_unix(from->last_logon);
                stored_time = pdb_get_logon_time(to);
-               DEBUG(10,("INFO_23 LOGON_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
-               if (stored_time != unix_time) 
+               DEBUG(10,("%s SAMR_FIELD_LAST_LOGON: %lu -> %lu\n", l,
+                       (long unsigned int)stored_time,
+                       (long unsigned int)unix_time));
+               if (stored_time != unix_time) {
                        pdb_set_logon_time(to, unix_time, PDB_CHANGED);
-       }       
-       if (!nt_time_is_zero(&from->logoff_time)) {
-               unix_time=nt_time_to_unix(&from->logoff_time);
+               }
+       }
+
+       if (from->fields_present & SAMR_FIELD_LAST_LOGOFF) {
+               unix_time = nt_time_to_unix(from->last_logoff);
                stored_time = pdb_get_logoff_time(to);
-               DEBUG(10,("INFO_23 LOGOFF_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
-               if (stored_time != unix_time) 
+               DEBUG(10,("%s SAMR_FIELD_LAST_LOGOFF: %lu -> %lu\n", l,
+                       (long unsigned int)stored_time,
+                       (long unsigned int)unix_time));
+               if (stored_time != unix_time) {
                        pdb_set_logoff_time(to, unix_time, PDB_CHANGED);
+               }
        }
-       
-       if (!nt_time_is_zero(&from->kickoff_time)) {
-               unix_time=nt_time_to_unix(&from->kickoff_time);
+
+       if (from->fields_present & SAMR_FIELD_ACCT_EXPIRY) {
+               unix_time = nt_time_to_unix(from->acct_expiry);
                stored_time = pdb_get_kickoff_time(to);
-               DEBUG(10,("INFO_23 KICKOFF_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
-               if (stored_time != unix_time) 
+               DEBUG(10,("%s SAMR_FIELD_ACCT_EXPIRY: %lu -> %lu\n", l,
+                       (long unsigned int)stored_time,
+                       (long unsigned int)unix_time));
+               if (stored_time != unix_time) {
                        pdb_set_kickoff_time(to, unix_time , PDB_CHANGED);
-       }       
-
-       if (!nt_time_is_zero(&from->pass_can_change_time)) {
-               unix_time=nt_time_to_unix(&from->pass_can_change_time);
-               stored_time = pdb_get_pass_can_change_time(to);
-               DEBUG(10,("INFO_23 PASS_CAN_CH: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
-               if (stored_time != unix_time) 
-                       pdb_set_pass_can_change_time(to, unix_time, PDB_CHANGED);
+               }
        }
-       if (!nt_time_is_zero(&from->pass_last_set_time)) {
-               unix_time=nt_time_to_unix(&from->pass_last_set_time);
+
+       if (from->fields_present & SAMR_FIELD_LAST_PWD_CHANGE) {
+               unix_time = nt_time_to_unix(from->last_password_change);
                stored_time = pdb_get_pass_last_set_time(to);
-               DEBUG(10,("INFO_23 PASS_LAST_SET: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
-               if (stored_time != unix_time) 
+               DEBUG(10,("%s SAMR_FIELD_LAST_PWD_CHANGE: %lu -> %lu\n", l,
+                       (long unsigned int)stored_time,
+                       (long unsigned int)unix_time));
+               if (stored_time != unix_time) {
                        pdb_set_pass_last_set_time(to, unix_time, PDB_CHANGED);
+               }
        }
 
-       if (!nt_time_is_zero(&from->pass_must_change_time)) {
-               unix_time=nt_time_to_unix(&from->pass_must_change_time);
-               stored_time=pdb_get_pass_must_change_time(to);
-               DEBUG(10,("INFO_23 PASS_MUST_CH: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
-               if (stored_time != unix_time) 
-                       pdb_set_pass_must_change_time(to, unix_time, PDB_CHANGED);
-       }
-
-       /* Backend should check this for sainity */
-       if (from->hdr_user_name.buffer) {
+       if ((from->fields_present & SAMR_FIELD_ACCOUNT_NAME) &&
+           (from->account_name.string)) {
                old_string = pdb_get_username(to);
-               new_string = unistr2_static(&from->uni_user_name);
-               DEBUG(10,("INFO_23 UNI_USER_NAME: %s -> %s\n", old_string, new_string));
-               if (STRING_CHANGED)
-                   pdb_set_username(to      , new_string, PDB_CHANGED);
+               new_string = from->account_name.string;
+               DEBUG(10,("%s SAMR_FIELD_ACCOUNT_NAME: %s -> %s\n", l,
+                       old_string, new_string));
+               if (STRING_CHANGED) {
+                       pdb_set_username(to, new_string, PDB_CHANGED);
+               }
        }
 
-       if (from->hdr_full_name.buffer) {
+       if ((from->fields_present & SAMR_FIELD_FULL_NAME) &&
+           (from->full_name.string)) {
                old_string = pdb_get_fullname(to);
-               new_string = unistr2_static(&from->uni_full_name);
-               DEBUG(10,("INFO_23 UNI_FULL_NAME: %s -> %s\n",old_string, new_string));
-               if (STRING_CHANGED)
-                       pdb_set_fullname(to      , new_string, PDB_CHANGED);
+               new_string = from->full_name.string;
+               DEBUG(10,("%s SAMR_FIELD_FULL_NAME: %s -> %s\n", l,
+                       old_string, new_string));
+               if (STRING_CHANGED) {
+                       pdb_set_fullname(to, new_string, PDB_CHANGED);
+               }
        }
-       
-       if (from->hdr_home_dir.buffer) {
+
+       if ((from->fields_present & SAMR_FIELD_HOME_DIRECTORY) &&
+           (from->home_directory.string)) {
                old_string = pdb_get_homedir(to);
-               new_string = unistr2_static(&from->uni_home_dir);
-               DEBUG(10,("INFO_23 UNI_HOME_DIR: %s -> %s\n",old_string,new_string));
-               if (STRING_CHANGED)
-                       pdb_set_homedir(to       , new_string, PDB_CHANGED);
+               new_string = from->home_directory.string;
+               DEBUG(10,("%s SAMR_FIELD_HOME_DIRECTORY: %s -> %s\n", l,
+                       old_string, new_string));
+               if (STRING_CHANGED) {
+                       pdb_set_homedir(to, new_string, PDB_CHANGED);
+               }
        }
 
-       if (from->hdr_dir_drive.buffer) {
+       if ((from->fields_present & SAMR_FIELD_HOME_DRIVE) &&
+           (from->home_drive.string)) {
                old_string = pdb_get_dir_drive(to);
-               new_string = unistr2_static(&from->uni_dir_drive);
-               DEBUG(10,("INFO_23 UNI_DIR_DRIVE: %s -> %s\n",old_string,new_string));
-               if (STRING_CHANGED)
-                       pdb_set_dir_drive(to     , new_string, PDB_CHANGED);
+               new_string = from->home_drive.string;
+               DEBUG(10,("%s SAMR_FIELD_HOME_DRIVE: %s -> %s\n", l,
+                       old_string, new_string));
+               if (STRING_CHANGED) {
+                       pdb_set_dir_drive(to, new_string, PDB_CHANGED);
+               }
        }
 
-       if (from->hdr_logon_script.buffer) {
+       if ((from->fields_present & SAMR_FIELD_LOGON_SCRIPT) &&
+           (from->logon_script.string)) {
                old_string = pdb_get_logon_script(to);
-               new_string = unistr2_static(&from->uni_logon_script);
-               DEBUG(10,("INFO_23 UNI_LOGON_SCRIPT: %s -> %s\n",old_string,new_string));
-               if (STRING_CHANGED)
+               new_string = from->logon_script.string;
+               DEBUG(10,("%s SAMR_FIELD_LOGON_SCRIPT: %s -> %s\n", l,
+                       old_string, new_string));
+               if (STRING_CHANGED) {
                        pdb_set_logon_script(to  , new_string, PDB_CHANGED);
+               }
        }
 
-       if (from->hdr_profile_path.buffer) {
+       if ((from->fields_present & SAMR_FIELD_PROFILE_PATH) &&
+           (from->profile_path.string)) {
                old_string = pdb_get_profile_path(to);
-               new_string = unistr2_static(&from->uni_profile_path);
-               DEBUG(10,("INFO_23 UNI_PROFILE_PATH: %s -> %s\n",old_string, new_string));
-               if (STRING_CHANGED)
+               new_string = from->profile_path.string;
+               DEBUG(10,("%s SAMR_FIELD_PROFILE_PATH: %s -> %s\n", l,
+                       old_string, new_string));
+               if (STRING_CHANGED) {
                        pdb_set_profile_path(to  , new_string, PDB_CHANGED);
+               }
        }
-       
-       if (from->hdr_acct_desc.buffer) {
+
+       if ((from->fields_present & SAMR_FIELD_DESCRIPTION) &&
+           (from->description.string)) {
                old_string = pdb_get_acct_desc(to);
-               new_string = unistr2_static(&from->uni_acct_desc);
-               DEBUG(10,("INFO_23 UNI_ACCT_DESC: %s -> %s\n",old_string,new_string));
-               if (STRING_CHANGED)
-                       pdb_set_acct_desc(to     , new_string, PDB_CHANGED);
+               new_string = from->description.string;
+               DEBUG(10,("%s SAMR_FIELD_DESCRIPTION: %s -> %s\n", l,
+                       old_string, new_string));
+               if (STRING_CHANGED) {
+                       pdb_set_acct_desc(to, new_string, PDB_CHANGED);
+               }
        }
-       
-       if (from->hdr_workstations.buffer) {
+
+       if ((from->fields_present & SAMR_FIELD_WORKSTATIONS) &&
+           (from->workstations.string)) {
                old_string = pdb_get_workstations(to);
-               new_string = unistr2_static(&from->uni_workstations);
-               DEBUG(10,("INFO_23 UNI_WORKSTATIONS: %s -> %s\n",old_string, new_string));
-               if (STRING_CHANGED)
+               new_string = from->workstations.string;
+               DEBUG(10,("%s SAMR_FIELD_WORKSTATIONS: %s -> %s\n", l,
+                       old_string, new_string));
+               if (STRING_CHANGED) {
                        pdb_set_workstations(to  , new_string, PDB_CHANGED);
+               }
        }
 
-       if (from->hdr_unknown_str.buffer) {
-               old_string = pdb_get_unknown_str(to);
-               new_string = unistr2_static(&from->uni_unknown_str);
-               DEBUG(10,("INFO_23 UNI_UNKNOWN_STR: %s -> %s\n",old_string, new_string));
-               if (STRING_CHANGED)
-                       pdb_set_unknown_str(to   , new_string, PDB_CHANGED);
+       if ((from->fields_present & SAMR_FIELD_COMMENT) &&
+           (from->comment.string)) {
+               old_string = pdb_get_comment(to);
+               new_string = from->comment.string;
+               DEBUG(10,("%s SAMR_FIELD_COMMENT: %s -> %s\n", l,
+                       old_string, new_string));
+               if (STRING_CHANGED) {
+                       pdb_set_comment(to, new_string, PDB_CHANGED);
+               }
        }
-       
-       if (from->hdr_munged_dial.buffer) {
+
+       if ((from->fields_present & SAMR_FIELD_PARAMETERS) &&
+           (from->parameters.array)) {
+               char *newstr;
+               DATA_BLOB mung;
                old_string = pdb_get_munged_dial(to);
-               new_string = unistr2_static(&from->uni_munged_dial);
-               DEBUG(10,("INFO_23 UNI_MUNGED_DIAL: %s -> %s\n",old_string, new_string));
-               if (STRING_CHANGED)
-                       pdb_set_munged_dial(to   , new_string, PDB_CHANGED);
-       }
-       
-       if (from->user_rid != pdb_get_user_rid(to)) {
-               DEBUG(10,("INFO_23 USER_RID: %u -> %u NOT UPDATED!\n",pdb_get_user_rid(to),from->user_rid));
-               /* we really allow this ??? metze */
-               /* pdb_set_user_sid_from_rid(to, from->user_rid, PDB_CHANGED);*/
-       }
-       
-       if (from->group_rid != pdb_get_group_rid(to)) {
-               DEBUG(10,("INFO_23 GROUP_RID: %u -> %u\n",pdb_get_group_rid(to),from->group_rid));
-               pdb_set_group_sid_from_rid(to, from->group_rid, PDB_CHANGED);
-       }
-       
-       DEBUG(10,("INFO_23 ACCT_CTRL: %08X -> %08X\n",pdb_get_acct_ctrl(to),from->acb_info));
-       if (from->acb_info != pdb_get_acct_ctrl(to)) {
-               pdb_set_acct_ctrl(to, from->acb_info, PDB_CHANGED);
-       }
 
-       DEBUG(10,("INFO_23 UNKOWN_3: %08X -> %08X\n",pdb_get_unknown_3(to),from->unknown_3));
-       if (from->unknown_3 != pdb_get_unknown_3(to)) {
-               pdb_set_unknown_3(to, from->unknown_3, PDB_CHANGED);
+               mung = data_blob_const(from->parameters.array,
+                                      from->parameters.length);
+               newstr = (mung.length == 0) ?
+                       NULL : base64_encode_data_blob(talloc_tos(), mung);
+               DEBUG(10,("%s SAMR_FIELD_PARAMETERS: %s -> %s\n", l,
+                       old_string, newstr));
+               if (STRING_CHANGED_NC(old_string,newstr)) {
+                       pdb_set_munged_dial(to, newstr, PDB_CHANGED);
+               }
+
+               TALLOC_FREE(newstr);
+       }
+
+       if (from->fields_present & SAMR_FIELD_RID) {
+               if (from->rid == 0) {
+                       DEBUG(10,("%s: Asked to set User RID to 0 !? Skipping change!\n", l));
+               } else if (from->rid != pdb_get_user_rid(to)) {
+                       DEBUG(10,("%s SAMR_FIELD_RID: %u -> %u NOT UPDATED!\n", l,
+                               pdb_get_user_rid(to), from->rid));
+               }
+       }
+
+       if (from->fields_present & SAMR_FIELD_PRIMARY_GID) {
+               if (from->primary_gid == 0) {
+                       DEBUG(10,("%s: Asked to set Group RID to 0 !? Skipping change!\n", l));
+               } else if (from->primary_gid != pdb_get_group_rid(to)) {
+                       DEBUG(10,("%s SAMR_FIELD_PRIMARY_GID: %u -> %u\n", l,
+                               pdb_get_group_rid(to), from->primary_gid));
+                       pdb_set_group_sid_from_rid(to,
+                               from->primary_gid, PDB_CHANGED);
+               }
+       }
+
+       if (from->fields_present & SAMR_FIELD_ACCT_FLAGS) {
+               DEBUG(10,("%s SAMR_FIELD_ACCT_FLAGS: %08X -> %08X\n", l,
+                       pdb_get_acct_ctrl(to), from->acct_flags));
+               if (from->acct_flags != pdb_get_acct_ctrl(to)) {
+                       if (!(from->acct_flags & ACB_AUTOLOCK) &&
+                            (pdb_get_acct_ctrl(to) & ACB_AUTOLOCK)) {
+                               /* We're unlocking a previously locked user. Reset bad password counts.
+                                  Patch from Jianliang Lu. <Jianliang.Lu@getronics.com> */
+                               pdb_set_bad_password_count(to, 0, PDB_CHANGED);
+                               pdb_set_bad_password_time(to, 0, PDB_CHANGED);
+                       }
+                       pdb_set_acct_ctrl(to, from->acct_flags, PDB_CHANGED);
+               }
+       }
+
+       if (from->fields_present & SAMR_FIELD_LOGON_HOURS) {
+               char oldstr[44]; /* hours strings are 42 bytes. */
+               char newstr[44];
+               DEBUG(15,("%s SAMR_FIELD_LOGON_HOURS (units_per_week): %08X -> %08X\n", l,
+                       pdb_get_logon_divs(to), from->logon_hours.units_per_week));
+               if (from->logon_hours.units_per_week != pdb_get_logon_divs(to)) {
+                       pdb_set_logon_divs(to,
+                               from->logon_hours.units_per_week, PDB_CHANGED);
+               }
+
+               DEBUG(15,("%s SAMR_FIELD_LOGON_HOURS (units_per_week/8): %08X -> %08X\n", l,
+                       pdb_get_hours_len(to),
+                       from->logon_hours.units_per_week/8));
+               if (from->logon_hours.units_per_week/8 != pdb_get_hours_len(to)) {
+                       pdb_set_hours_len(to,
+                               from->logon_hours.units_per_week/8, PDB_CHANGED);
+               }
+
+               DEBUG(15,("%s SAMR_FIELD_LOGON_HOURS (bits): %s -> %s\n", l,
+                       pdb_get_hours(to), from->logon_hours.bits));
+               pdb_sethexhours(oldstr, pdb_get_hours(to));
+               pdb_sethexhours(newstr, from->logon_hours.bits);
+               if (!strequal(oldstr, newstr)) {
+                       pdb_set_hours(to, from->logon_hours.bits, PDB_CHANGED);
+               }
+       }
+
+       if (from->fields_present & SAMR_FIELD_BAD_PWD_COUNT) {
+               DEBUG(10,("%s SAMR_FIELD_BAD_PWD_COUNT: %08X -> %08X\n", l,
+                       pdb_get_bad_password_count(to), from->bad_password_count));
+               if (from->bad_password_count != pdb_get_bad_password_count(to)) {
+                       pdb_set_bad_password_count(to,
+                               from->bad_password_count, PDB_CHANGED);
+               }
+       }
+
+       if (from->fields_present & SAMR_FIELD_NUM_LOGONS) {
+               DEBUG(10,("%s SAMR_FIELD_NUM_LOGONS: %08X -> %08X\n", l,
+                       pdb_get_logon_count(to), from->logon_count));
+               if (from->logon_count != pdb_get_logon_count(to)) {
+                       pdb_set_logon_count(to, from->logon_count, PDB_CHANGED);
+               }
+       }
+
+       /* If the must change flag is set, the last set time goes to zero.
+          the must change and can change fields also do, but they are
+          calculated from policy, not set from the wire */
+
+       if (from->fields_present & SAMR_FIELD_EXPIRED_FLAG) {
+               DEBUG(10,("%s SAMR_FIELD_EXPIRED_FLAG: %02X\n", l,
+                       from->password_expired));
+               if (from->password_expired != 0) {
+                       pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);
+               } else {
+                       /* A subtlety here: some windows commands will
+                          clear the expired flag even though it's not
+                          set, and we don't want to reset the time
+                          in these caess.  "net user /dom <user> /active:y"
+                          for example, to clear an autolocked acct.
+                          We must check to see if it's expired first. jmcd */
+
+                       uint32_t pwd_max_age = 0;
+                       time_t now = time(NULL);
+
+                       pdb_get_account_policy(AP_MAX_PASSWORD_AGE, &pwd_max_age);
+
+                       if (pwd_max_age == (uint32_t)-1 || pwd_max_age == 0) {
+                               pwd_max_age = get_time_t_max();
+                       }
+
+                       stored_time = pdb_get_pass_last_set_time(to);
+
+                       /* we will only *set* a pwdlastset date when
+                          a) the last pwdlastset time was 0 (user was forced to
+                             change password).
+                          b) the users password has not expired. gd. */
+
+                       if ((stored_time == 0) ||
+                           ((now - stored_time) > pwd_max_age)) {
+                               pdb_set_pass_last_set_time(to, now, PDB_CHANGED);
+                       }
+               }
        }
+}
 
-       DEBUG(15,("INFO_23 LOGON_DIVS: %08X -> %08X\n",pdb_get_logon_divs(to),from->logon_divs));
-       if (from->logon_divs != pdb_get_logon_divs(to)) {
-               pdb_set_logon_divs(to, from->logon_divs, PDB_CHANGED);
-       }
 
-       DEBUG(15,("INFO_23 LOGON_HRS.LEN: %08X -> %08X\n",pdb_get_hours_len(to),from->logon_hrs.len));
-       if (from->logon_hrs.len != pdb_get_hours_len(to)) {
-               pdb_set_hours_len(to, from->logon_hrs.len, PDB_CHANGED);
+/*************************************************************
+ Copies a struct samr_UserInfo23 to a struct samu
+**************************************************************/
+
+void copy_id23_to_sam_passwd(struct samu *to,
+                            struct samr_UserInfo23 *from)
+{
+       if (from == NULL || to == NULL) {
+               return;
        }
 
-       DEBUG(15,("INFO_23 LOGON_HRS.HOURS: %s -> %s\n",pdb_get_hours(to),from->logon_hrs.hours));
-/* Fix me: only update if it changes --metze */
-       pdb_set_hours(to, from->logon_hrs.hours, PDB_CHANGED);
+       copy_id21_to_sam_passwd("INFO 23", to, &from->info);
+}
 
-       DEBUG(10,("INFO_23 UNKOWN_5: %08X -> %08X\n",pdb_get_unknown_5(to),from->unknown_5));
-       if (from->unknown_5 != pdb_get_unknown_5(to)) {
-               pdb_set_unknown_5(to, from->unknown_5, PDB_CHANGED);
-       }
+/*************************************************************
+ Copies a struct samr_UserInfo24 to a struct samu
+**************************************************************/
+
+void copy_id24_to_sam_passwd(struct samu *to,
+                            struct samr_UserInfo24 *from)
+{
+       struct samr_UserInfo21 i;
 
-       DEBUG(10,("INFO_23 UNKOWN_6: %08X -> %08X\n",pdb_get_unknown_6(to),from->unknown_6));
-       if (from->unknown_6 != pdb_get_unknown_6(to)) {
-               pdb_set_unknown_6(to, from->unknown_6, PDB_CHANGED);
+       if (from == NULL || to == NULL) {
+               return;
        }
 
-       DEBUG(10,("INFO_23 PADDING1 %02X %02X %02X %02X %02X %02X\n",
-                 from->padding1[0],
-                 from->padding1[1],
-                 from->padding1[2],
-                 from->padding1[3],
-                 from->padding1[4],
-                 from->padding1[5]));
+       ZERO_STRUCT(i);
 
-       DEBUG(10,("INFO_23 PASS_MUST_CHANGE_AT_NEXT_LOGON: %02X\n",from->passmustchange));
-       if (from->passmustchange==PASS_MUST_CHANGE_AT_NEXT_LOGON) {
-               pdb_set_pass_must_change_time(to,0, PDB_CHANGED);               
-       }
+       i.fields_present        = SAMR_FIELD_EXPIRED_FLAG;
+       i.password_expired      = from->password_expired;
 
-       DEBUG(10,("INFO_23 PADDING_2: %02X\n",from->padding2));
+       copy_id21_to_sam_passwd("INFO_24", to, &i);
+}
+
+/*************************************************************
+ Copies a struct samr_UserInfo25 to a struct samu
+**************************************************************/
+
+void copy_id25_to_sam_passwd(struct samu *to,
+                            struct samr_UserInfo25 *from)
+{
+       if (from == NULL || to == NULL) {
+               return;
+       }
 
-       DEBUG(10,("INFO_23 PADDING_4: %08X\n",from->padding4));
+       copy_id21_to_sam_passwd("INFO_25", to, &from->info);
 }
 
+/*************************************************************
+ Copies a struct samr_UserInfo26 to a struct samu
+**************************************************************/
+
+void copy_id26_to_sam_passwd(struct samu *to,
+                            struct samr_UserInfo26 *from)
+{
+       struct samr_UserInfo21 i;
+
+       if (from == NULL || to == NULL) {
+               return;
+       }
+
+       ZERO_STRUCT(i);
+
+       i.fields_present        = SAMR_FIELD_EXPIRED_FLAG;
+       i.password_expired      = from->password_expired;
 
+       copy_id21_to_sam_passwd("INFO_26", to, &i);
+}