Author: vlendec Date: 2006-11-29 08:51:18 +0000 (Wed, 29 Nov 2006) New Revision: 19946
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19946 Log: in SetKeySec, sd is just a [in,ref] ptr Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.c branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c branches/SAMBA_3_0/source/librpc/gen_ndr/srv_winreg.c branches/SAMBA_3_0/source/librpc/gen_ndr/winreg.h branches/SAMBA_3_0/source/librpc/idl/winreg.idl Changeset: Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.c =================================================================== --- branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.c 2006-11-29 08:11:33 UTC (rev 19945) +++ branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.c 2006-11-29 08:51:18 UTC (rev 19946) @@ -739,7 +739,6 @@ } /* Return variables */ - *sd = *r.out.sd; /* Return result */ return werror_to_ntstatus(r.out.result); Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c =================================================================== --- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c 2006-11-29 08:11:33 UTC (rev 19945) +++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c 2006-11-29 08:51:18 UTC (rev 19946) @@ -2875,8 +2875,6 @@ NDR_CHECK(ndr_push_KeySecurityData(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.sd)); } if (flags & NDR_OUT) { - if (r->out.sd == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; - NDR_CHECK(ndr_push_KeySecurityData(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sd)); NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result)); } return NT_STATUS_OK; @@ -2887,8 +2885,6 @@ TALLOC_CTX *_mem_save_handle_0; TALLOC_CTX *_mem_save_sd_0; if (flags & NDR_IN) { - ZERO_STRUCT(r->out); - if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_PULL_ALLOC(ndr, r->in.handle); } @@ -2904,17 +2900,8 @@ NDR_PULL_SET_MEM_CTX(ndr, r->in.sd, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_KeySecurityData(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.sd)); NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sd_0, LIBNDR_FLAG_REF_ALLOC); - NDR_PULL_ALLOC(ndr, r->out.sd); - *r->out.sd = *r->in.sd; } if (flags & NDR_OUT) { - if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { - NDR_PULL_ALLOC(ndr, r->out.sd); - } - _mem_save_sd_0 = NDR_PULL_GET_MEM_CTX(ndr); - NDR_PULL_SET_MEM_CTX(ndr, r->out.sd, LIBNDR_FLAG_REF_ALLOC); - NDR_CHECK(ndr_pull_KeySecurityData(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sd)); - NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sd_0, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result)); } return NT_STATUS_OK; @@ -2944,10 +2931,6 @@ if (flags & NDR_OUT) { ndr_print_struct(ndr, "out", "winreg_SetKeySecurity"); ndr->depth++; - ndr_print_ptr(ndr, "sd", r->out.sd); - ndr->depth++; - ndr_print_KeySecurityData(ndr, "sd", r->out.sd); - ndr->depth--; ndr_print_WERROR(ndr, "result", r->out.result); ndr->depth--; } Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/srv_winreg.c =================================================================== --- branches/SAMBA_3_0/source/librpc/gen_ndr/srv_winreg.c 2006-11-29 08:11:33 UTC (rev 19945) +++ branches/SAMBA_3_0/source/librpc/gen_ndr/srv_winreg.c 2006-11-29 08:51:18 UTC (rev 19946) @@ -1499,8 +1499,6 @@ if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(winreg_SetKeySecurity, &r); - ZERO_STRUCT(r.out); - r.out.sd = r.in.sd; r.out.result = _winreg_SetKeySecurity(p, r.in.handle, r.in.access_mask, r.in.sd); if (p->rng_fault_state) { Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/winreg.h =================================================================== --- branches/SAMBA_3_0/source/librpc/gen_ndr/winreg.h 2006-11-29 08:11:33 UTC (rev 19945) +++ branches/SAMBA_3_0/source/librpc/gen_ndr/winreg.h 2006-11-29 08:51:18 UTC (rev 19946) @@ -406,7 +406,6 @@ } in; struct { - struct KeySecurityData *sd;/* [ref] */ WERROR result; } out; Modified: branches/SAMBA_3_0/source/librpc/idl/winreg.idl =================================================================== --- branches/SAMBA_3_0/source/librpc/idl/winreg.idl 2006-11-29 08:11:33 UTC (rev 19945) +++ branches/SAMBA_3_0/source/librpc/idl/winreg.idl 2006-11-29 08:51:18 UTC (rev 19946) @@ -275,7 +275,7 @@ WERROR winreg_SetKeySecurity( [in,ref] policy_handle *handle, [in] winreg_AccessMask access_mask, - [in,out,ref] KeySecurityData *sd + [in,ref] KeySecurityData *sd ); /******************/
