From: Volker Lendecke <vl@samba.org>
Date: Tue, 15 Feb 2011 18:13:52 +0000 (+0100)
Subject: s3: Pass "code_page" through samr
X-Git-Tag: tevent-0.9.11~643
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ef0e1ef221d9c9552a45a1e302d49f417cef1b5;p=thirdparty%2Fsamba.git

s3: Pass "code_page" through samr
---

diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index 7432e016015..7a076435973 100644
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -2489,7 +2489,7 @@ static NTSTATUS get_user_info_2(TALLOC_CTX *mem_ctx,
 	r->comment.string		= talloc_strdup(mem_ctx, pdb_get_comment(pw));
 	r->reserved.string		= NULL;
 	r->country_code			= pdb_get_country_code(pw);
-	r->code_page			= 0;
+	r->code_page			= pdb_get_code_page(pw);
 
 	return NT_STATUS_OK;
 }
@@ -2975,7 +2975,7 @@ static NTSTATUS get_user_info_21(TALLOC_CTX *mem_ctx,
 	r->password_expired		= (pdb_get_pass_must_change_time(pw) == 0) ?
 						PASS_MUST_CHANGE_AT_NEXT_LOGON : 0;
 	r->country_code			= pdb_get_country_code(pw);
-	r->code_page			= 0;
+	r->code_page			= pdb_get_code_page(pw);
 	r->lm_password_set		= 0;
 	r->nt_password_set		= 0;
 
diff --git a/source3/rpc_server/samr/srv_samr_util.c b/source3/rpc_server/samr/srv_samr_util.c
index 77d40e0251c..0bab1271f25 100644
--- a/source3/rpc_server/samr/srv_samr_util.c
+++ b/source3/rpc_server/samr/srv_samr_util.c
@@ -649,6 +649,15 @@ void copy_id21_to_sam_passwd(const char *log_prefix,
 				from->country_code, PDB_CHANGED);
 		}
 	}
+
+	if (from->fields_present & SAMR_FIELD_CODE_PAGE) {
+		DEBUG(10,("%s SAMR_FIELD_CODE_PAGE: %08X -> %08X\n", l,
+			pdb_get_code_page(to), from->code_page));
+		if (from->code_page != pdb_get_code_page(to)) {
+			pdb_set_code_page(to,
+				from->code_page, PDB_CHANGED);
+		}
+	}
 }