Merge passdb from HEAD -> 3.0

The work here includes:
 - metze' set/changed patch, which avoids making changes to ldap on unmodified
attributes.

 - volker's group mapping in passdb patch

 - volker's samsync stuff
 - volkers SAMR changes.

 - mezte's connection caching patch

 - my recent changes (fix magic root check, ldap ssl)

Andrew Bartlett
(This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)

1 files changed, 92 insertions, 66 deletions

diff --git a/source3/rpc_server/srv_samr_util.c b/source3/rpc_server/srv_samr_util.c
index 18297056d6..97c7b67839 100644
--- a/source3/rpc_server/srv_samr_util.c
+++ b/source3/rpc_server/srv_samr_util.c
@@ -47,14 +47,14 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		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, True);
+			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, True);
+			pdb_set_logoff_time(to, unix_time, PDB_CHANGED);
 	}
 	
 	if (!nt_time_is_zero(&from->kickoff_time)) {
@@ -62,7 +62,7 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		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 , True);
+			pdb_set_kickoff_time(to, unix_time , PDB_CHANGED);
 	}	
 
 	if (!nt_time_is_zero(&from->pass_can_change_time)) {
@@ -70,14 +70,14 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		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, True);
+			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_set_pass_last_set_time(to, unix_time, PDB_CHANGED);
 	}
 
 	if (!nt_time_is_zero(&from->pass_must_change_time)) {
@@ -85,7 +85,7 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		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, True);
+			pdb_set_pass_must_change_time(to, unix_time, PDB_CHANGED);
 	}
 
 	/* Backend should check this for sainity */
@@ -94,15 +94,15 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		new_string = pdb_unistr2_convert(&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_set_username(to      , new_string, PDB_CHANGED);
 	}
 
 	if (from->hdr_full_name.buffer) {
 		old_string = pdb_get_fullname(to);
-		new_string = pdb_unistr2_convert(&from->uni_user_name);
+		new_string = pdb_unistr2_convert(&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_set_fullname(to      , new_string, PDB_CHANGED);
 	}
 	
 	if (from->hdr_home_dir.buffer) {
@@ -110,7 +110,7 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		new_string = pdb_unistr2_convert(&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, True);
+			pdb_set_homedir(to       , new_string, PDB_CHANGED);
 	}
 
 	if (from->hdr_dir_drive.buffer) {
@@ -118,7 +118,7 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		new_string = pdb_unistr2_convert(&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, True);
+			pdb_set_dir_drive(to     , new_string, PDB_CHANGED);
 	}
 
 	if (from->hdr_logon_script.buffer) {
@@ -126,7 +126,7 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		new_string = pdb_unistr2_convert(&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, True);
+			pdb_set_logon_script(to  , new_string, PDB_CHANGED);
 	}
 
 	if (from->hdr_profile_path.buffer) {
@@ -134,7 +134,7 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		new_string = pdb_unistr2_convert(&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, True);
+			pdb_set_profile_path(to  , new_string, PDB_CHANGED);
 	}
 	
 	if (from->hdr_acct_desc.buffer) {
@@ -142,7 +142,7 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		new_string = pdb_unistr2_convert(&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_set_acct_desc(to     , new_string, PDB_CHANGED);
 	}
 	
 	if (from->hdr_workstations.buffer) {
@@ -150,7 +150,7 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		new_string = pdb_unistr2_convert(&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_set_workstations(to  , new_string, PDB_CHANGED);
 	}
 
 	if (from->hdr_unknown_str.buffer) {
@@ -158,7 +158,7 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		new_string = pdb_unistr2_convert(&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_set_unknown_str(to   , new_string, PDB_CHANGED);
 	}
 	
 	if (from->hdr_munged_dial.buffer) {
@@ -166,40 +166,53 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 		new_string = pdb_unistr2_convert(&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_set_munged_dial(to   , new_string, PDB_CHANGED);
 	}
 	
-	if (from->user_rid) {
+	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_set_user_sid_from_rid(to, from->user_rid, PDB_CHANGED);*/
 	}
 	
-	if (from->group_rid) {
+	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_set_group_sid_from_rid(to, from->group_rid, PDB_CHANGED);
 	}
 	
 	DEBUG(10,("INFO_21 ACCT_CTRL: %08X -> %08X\n",pdb_get_acct_ctrl(to),from->acb_info));
-	pdb_set_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_21 UNKOWN_3: %08X -> %08X\n",pdb_get_unknown3(to),from->unknown_3));
-	pdb_set_unknown_3(to, from->unknown_3);
-	
+	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);
+	}
 
 	DEBUG(15,("INFO_21 LOGON_DIVS: %08X -> %08X\n",pdb_get_logon_divs(to),from->logon_divs));
-	pdb_set_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_21 LOGON_HRS.LEN: %08X -> %08X\n",pdb_get_hours_len(to),from->logon_hrs.len));
-	pdb_set_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);
+	}
+
 	DEBUG(15,("INFO_21 LOGON_HRS.HOURS: %s -> %s\n",pdb_get_hours(to),from->logon_hrs.hours));
-	pdb_set_hours(to, from->logon_hrs.hours);
+/* Fix me: only update if it changes --metze */
+	pdb_set_hours(to, from->logon_hrs.hours, PDB_CHANGED);
 
-	DEBUG(10,("INFO_21 UNKOWN_5: %08X -> %08X\n",pdb_get_unknown5(to),from->unknown_5));
-	pdb_set_unknown_5(to, from->unknown_5);
+	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);
+	}
 
-	DEBUG(10,("INFO_21 UNKOWN_6: %08X -> %08X\n",pdb_get_unknown6(to),from->unknown_6));
-	pdb_set_unknown_6(to, from->unknown_6);
+	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);
+	}
 
 	DEBUG(10,("INFO_21 PADDING1 %02X %02X %02X %02X %02X %02X\n",
 		  from->padding1[0],
@@ -211,7 +224,7 @@ void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
 
 	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, True);		
+		pdb_set_pass_must_change_time(to,0, PDB_CHANGED);		
 	}
 
 	DEBUG(10,("INFO_21 PADDING_2: %02X\n",from->padding2));
@@ -236,14 +249,14 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		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) 
-			pdb_set_logon_time(to, unix_time, True);
+			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_23 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, True);
+			pdb_set_logoff_time(to, unix_time, PDB_CHANGED);
 	}
 	
 	if (!nt_time_is_zero(&from->kickoff_time)) {
@@ -251,7 +264,7 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		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) 
-			pdb_set_kickoff_time(to, unix_time , True);
+			pdb_set_kickoff_time(to, unix_time , PDB_CHANGED);
 	}	
 
 	if (!nt_time_is_zero(&from->pass_can_change_time)) {
@@ -259,14 +272,14 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		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, True);
+			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_23 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_set_pass_last_set_time(to, unix_time, PDB_CHANGED);
 	}
 
 	if (!nt_time_is_zero(&from->pass_must_change_time)) {
@@ -274,7 +287,7 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		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, True);
+			pdb_set_pass_must_change_time(to, unix_time, PDB_CHANGED);
 	}
 
 	/* Backend should check this for sainity */
@@ -283,15 +296,15 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		new_string = pdb_unistr2_convert(&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_set_username(to      , new_string, PDB_CHANGED);
 	}
 
 	if (from->hdr_full_name.buffer) {
 		old_string = pdb_get_fullname(to);
-		new_string = pdb_unistr2_convert(&from->uni_user_name);
+		new_string = pdb_unistr2_convert(&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_set_fullname(to      , new_string, PDB_CHANGED);
 	}
 	
 	if (from->hdr_home_dir.buffer) {
@@ -299,7 +312,7 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		new_string = pdb_unistr2_convert(&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, True);
+			pdb_set_homedir(to       , new_string, PDB_CHANGED);
 	}
 
 	if (from->hdr_dir_drive.buffer) {
@@ -307,7 +320,7 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		new_string = pdb_unistr2_convert(&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, True);
+			pdb_set_dir_drive(to     , new_string, PDB_CHANGED);
 	}
 
 	if (from->hdr_logon_script.buffer) {
@@ -315,7 +328,7 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		new_string = pdb_unistr2_convert(&from->uni_logon_script);
 		DEBUG(10,("INFO_23 UNI_LOGON_SCRIPT: %s -> %s\n",old_string,new_string));
 		if (STRING_CHANGED)
-			pdb_set_logon_script(to  , new_string, True);
+			pdb_set_logon_script(to  , new_string, PDB_CHANGED);
 	}
 
 	if (from->hdr_profile_path.buffer) {
@@ -323,7 +336,7 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		new_string = pdb_unistr2_convert(&from->uni_profile_path);
 		DEBUG(10,("INFO_23 UNI_PROFILE_PATH: %s -> %s\n",old_string, new_string));
 		if (STRING_CHANGED)
-			pdb_set_profile_path(to  , new_string, True);
+			pdb_set_profile_path(to  , new_string, PDB_CHANGED);
 	}
 	
 	if (from->hdr_acct_desc.buffer) {
@@ -331,7 +344,7 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		new_string = pdb_unistr2_convert(&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_set_acct_desc(to     , new_string, PDB_CHANGED);
 	}
 	
 	if (from->hdr_workstations.buffer) {
@@ -339,7 +352,7 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		new_string = pdb_unistr2_convert(&from->uni_workstations);
 		DEBUG(10,("INFO_23 UNI_WORKSTATIONS: %s -> %s\n",old_string, new_string));
 		if (STRING_CHANGED)
-			pdb_set_workstations(to  , new_string);
+			pdb_set_workstations(to  , new_string, PDB_CHANGED);
 	}
 
 	if (from->hdr_unknown_str.buffer) {
@@ -347,7 +360,7 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		new_string = pdb_unistr2_convert(&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_set_unknown_str(to   , new_string, PDB_CHANGED);
 	}
 	
 	if (from->hdr_munged_dial.buffer) {
@@ -355,40 +368,53 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 		new_string = pdb_unistr2_convert(&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_set_munged_dial(to   , new_string, PDB_CHANGED);
 	}
 	
-	if (from->user_rid) {
+	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_set_user_sid_from_rid(to, from->user_rid, PDB_CHANGED);*/
 	}
 	
-	if (from->group_rid) {
+	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_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));
-	pdb_set_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_unknown3(to),from->unknown_3));
-	pdb_set_unknown_3(to, from->unknown_3);
-	
+	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);
+	}
 
 	DEBUG(15,("INFO_23 LOGON_DIVS: %08X -> %08X\n",pdb_get_logon_divs(to),from->logon_divs));
-	pdb_set_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));
-	pdb_set_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);
+	}
+
 	DEBUG(15,("INFO_23 LOGON_HRS.HOURS: %s -> %s\n",pdb_get_hours(to),from->logon_hrs.hours));
-	pdb_set_hours(to, from->logon_hrs.hours);
+/* Fix me: only update if it changes --metze */
+	pdb_set_hours(to, from->logon_hrs.hours, PDB_CHANGED);
 
-	DEBUG(10,("INFO_23 UNKOWN_5: %08X -> %08X\n",pdb_get_unknown5(to),from->unknown_5));
-	pdb_set_unknown_5(to, from->unknown_5);
+	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);
+	}
 
-	DEBUG(10,("INFO_23 UNKOWN_6: %08X -> %08X\n",pdb_get_unknown6(to),from->unknown_6));
-	pdb_set_unknown_6(to, from->unknown_6);
+	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);
+	}
 
 	DEBUG(10,("INFO_23 PADDING1 %02X %02X %02X %02X %02X %02X\n",
 		  from->padding1[0],
@@ -400,7 +426,7 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
 
 	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, True);		
+		pdb_set_pass_must_change_time(to,0, PDB_CHANGED);		
 	}
 
 	DEBUG(10,("INFO_23 PADDING_2: %02X\n",from->padding2));