Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

1 files changed, 10 insertions, 10 deletions

diff --git a/source3/librpc/gen_ndr/cli_winreg.c b/source3/librpc/gen_ndr/cli_winreg.c
index 29f7e50c45..17b7281c72 100644
--- a/source3/librpc/gen_ndr/cli_winreg.c
+++ b/source3/librpc/gen_ndr/cli_winreg.c
@@ -497,7 +497,7 @@ NTSTATUS rpccli_winreg_EnumValue(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
 				 struct policy_handle *handle /* [in] [ref] */,
 				 uint32_t enum_index /* [in]  */,
-				 struct winreg_ValNameBuf *name /* [in,out] [ref] */,
+				 struct winreg_StringBuf *name /* [in,out] [ref] */,
 				 enum winreg_Type *type /* [in,out] [unique] */,
 				 uint8_t *value /* [in,out] [unique,length_is(*length),size_is(*size)] */,
 				 uint32_t *size /* [in,out] [unique] */,
@@ -872,9 +872,9 @@ NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
 				  struct policy_handle *handle /* [in] [ref] */,
 				  struct winreg_String *value_name /* [in] [ref] */,
 				  enum winreg_Type *type /* [in,out] [unique] */,
-				  uint8_t *data /* [in,out] [unique,length_is(*value_length),size_is(*data_size)] */,
+				  uint8_t *data /* [in,out] [unique,length_is(*data_length),size_is(*data_size)] */,
 				  uint32_t *data_size /* [in,out] [unique] */,
-				  uint32_t *value_length /* [in,out] [unique] */,
+				  uint32_t *data_length /* [in,out] [unique] */,
 				  WERROR *werror)
 {
 	struct winreg_QueryValue r;
@@ -886,7 +886,7 @@ NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
 	r.in.type = type;
 	r.in.data = data;
 	r.in.data_size = data_size;
-	r.in.value_length = value_length;
+	r.in.data_length = data_length;
 
 	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(winreg_QueryValue, &r);
@@ -920,8 +920,8 @@ NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
 	if (data_size && r.out.data_size) {
 		*data_size = *r.out.data_size;
 	}
-	if (value_length && r.out.value_length) {
-		*value_length = *r.out.value_length;
+	if (data_length && r.out.data_length) {
+		*data_length = *r.out.data_length;
 	}
 
 	/* Return result */
@@ -1070,7 +1070,7 @@ NTSTATUS rpccli_winreg_SaveKey(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_winreg_SetKeySecurity(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
 				      struct policy_handle *handle /* [in] [ref] */,
-				      uint32_t access_mask /* [in]  */,
+				      uint32_t sec_info /* [in]  */,
 				      struct KeySecurityData *sd /* [in] [ref] */,
 				      WERROR *werror)
 {
@@ -1079,7 +1079,7 @@ NTSTATUS rpccli_winreg_SetKeySecurity(struct rpc_pipe_client *cli,
 
 	/* In parameters */
 	r.in.handle = handle;
-	r.in.access_mask = access_mask;
+	r.in.sec_info = sec_info;
 	r.in.sd = sd;
 
 	if (DEBUGLEVEL >= 10) {
@@ -1209,7 +1209,7 @@ NTSTATUS rpccli_winreg_UnLoadKey(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli,
 					      TALLOC_CTX *mem_ctx,
 					      uint16_t *hostname /* [in] [unique] */,
-					      struct initshutdown_String *message /* [in] [unique] */,
+					      struct lsa_StringLarge *message /* [in] [unique] */,
 					      uint32_t timeout /* [in]  */,
 					      uint8_t force_apps /* [in]  */,
 					      uint8_t do_reboot /* [in]  */,
@@ -1498,7 +1498,7 @@ NTSTATUS rpccli_winreg_QueryMultipleValues(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli,
 						TALLOC_CTX *mem_ctx,
 						uint16_t *hostname /* [in] [unique] */,
-						struct initshutdown_String *message /* [in] [unique] */,
+						struct lsa_StringLarge *message /* [in] [unique] */,
 						uint32_t timeout /* [in]  */,
 						uint8_t force_apps /* [in]  */,
 						uint8_t do_reboot /* [in]  */,