[SCM] Samba Shared Repository - branch master updated - d7264320f47453c3b6c32f8298783ad5b2343487

[Günther Deschner]

The branch, master has been updated
       via  d7264320f47453c3b6c32f8298783ad5b2343487 (commit)
       via  82aeb52ec067d21559407e564eb5901f92c8020f (commit)
      from  e941e4ad5223816d3d022e6d87a8e88a74db2850 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d7264320f47453c3b6c32f8298783ad5b2343487
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 17 22:53:11 2008 +0200

    s3-build: re-run make samba3-idl.
    
    Guenther

commit 82aeb52ec067d21559407e564eb5901f92c8020f
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 17 22:52:16 2008 +0200

    s3-winreg: merge from s4 winreg idl.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/librpc/gen_ndr/cli_winreg.c |    4 ++--
 source3/librpc/gen_ndr/cli_winreg.h |    2 +-
 source3/librpc/gen_ndr/ndr_winreg.c |    6 +++---
 source3/librpc/gen_ndr/winreg.h     |    2 +-
 source3/librpc/idl/winreg.idl       |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/librpc/gen_ndr/cli_winreg.c b/source3/librpc/gen_ndr/cli_winreg.c
index 9ad1a47..d558a5a 100644
--- a/source3/librpc/gen_ndr/cli_winreg.c
+++ b/source3/librpc/gen_ndr/cli_winreg.c
@@ -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) {
diff --git a/source3/librpc/gen_ndr/cli_winreg.h b/source3/librpc/gen_ndr/cli_winreg.h
index 8ce043c..ce2bfcd 100644
--- a/source3/librpc/gen_ndr/cli_winreg.h
+++ b/source3/librpc/gen_ndr/cli_winreg.h
@@ -148,7 +148,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);
 NTSTATUS rpccli_winreg_SetValue(struct rpc_pipe_client *cli,
diff --git a/source3/librpc/gen_ndr/ndr_winreg.c b/source3/librpc/gen_ndr/ndr_winreg.c
index 818ce65..41c9acd 100644
--- a/source3/librpc/gen_ndr/ndr_winreg.c
+++ b/source3/librpc/gen_ndr/ndr_winreg.c
@@ -3003,7 +3003,7 @@ static enum ndr_err_code ndr_push_winreg_SetKeySecurity(struct ndr_push *ndr, in
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.handle));
-		NDR_CHECK(ndr_push_winreg_AccessMask(ndr, NDR_SCALARS, r->in.access_mask));
+		NDR_CHECK(ndr_push_security_secinfo(ndr, NDR_SCALARS, r->in.sec_info));
 		if (r->in.sd == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -3027,7 +3027,7 @@ static enum ndr_err_code ndr_pull_winreg_SetKeySecurity(struct ndr_pull *ndr, in
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_winreg_AccessMask(ndr, NDR_SCALARS, &r->in.access_mask));
+		NDR_CHECK(ndr_pull_security_secinfo(ndr, NDR_SCALARS, &r->in.sec_info));
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->in.sd);
 		}
@@ -3056,7 +3056,7 @@ _PUBLIC_ void ndr_print_winreg_SetKeySecurity(struct ndr_print *ndr, const char
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "handle", r->in.handle);
 		ndr->depth--;
-		ndr_print_winreg_AccessMask(ndr, "access_mask", r->in.access_mask);
+		ndr_print_security_secinfo(ndr, "sec_info", r->in.sec_info);
 		ndr_print_ptr(ndr, "sd", r->in.sd);
 		ndr->depth++;
 		ndr_print_KeySecurityData(ndr, "sd", r->in.sd);
diff --git a/source3/librpc/gen_ndr/winreg.h b/source3/librpc/gen_ndr/winreg.h
index ddcb363..0f3c45e 100644
--- a/source3/librpc/gen_ndr/winreg.h
+++ b/source3/librpc/gen_ndr/winreg.h
@@ -443,7 +443,7 @@ struct winreg_SaveKey {
 struct winreg_SetKeySecurity {
 	struct {
 		struct policy_handle *handle;/* [ref] */
-		uint32_t access_mask;
+		uint32_t sec_info;
 		struct KeySecurityData *sd;/* [ref] */
 	} in;
 
diff --git a/source3/librpc/idl/winreg.idl b/source3/librpc/idl/winreg.idl
index dc4b1ba..58f5eab 100644
--- a/source3/librpc/idl/winreg.idl
+++ b/source3/librpc/idl/winreg.idl
@@ -288,7 +288,7 @@ import "lsa.idl", "security.idl";
 	/* Function: 0x15 */
 	WERROR winreg_SetKeySecurity(
 		[in,ref] policy_handle *handle,
-		[in] winreg_AccessMask access_mask,
+		[in] security_secinfo sec_info,
 		[in,ref] KeySecurityData *sd
 	);
 


-- 
Samba Shared Repository