s4-lsa: merge lsa_QuerySecurity from s3 lsa idl.

Guenther

diff --git a/source3/librpc/idl/lsa.idl b/source3/librpc/idl/lsa.idl
index a443448871afe58c9875db6e9871bef259763e5b..1f48e317c977a8d1fd4a277c09160950300cd89e 100644 (file)
--- a/source3/librpc/idl/lsa.idl
+++ b/source3/librpc/idl/lsa.idl
@@ -91,14 +91,12 @@ import "misc.idl", "security.idl";
 
        /******************/
        /* Function: 0x03 */
-
        NTSTATUS lsa_QuerySecurity (
-               [in]     policy_handle *handle,
-               [in]         security_secinfo sec_info,
-               [out,ref]    sec_desc_buf **sdbuf
+               [in]            policy_handle *handle,
+               [in]            security_secinfo sec_info,
+               [out,ref]       sec_desc_buf **sdbuf
                );
 
-
        /******************/
        /* Function: 0x04 */
        NTSTATUS lsa_SetSecObj(

diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index 4a7a42b4dc956802c93dac29972613adfb88e6bc..45206a6fdaa6cc895f2e1816457bf5e928411d87 100644 (file)
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -91,14 +91,12 @@ import "misc.idl", "security.idl";
 
        /******************/
        /* Function: 0x03 */
-
        NTSTATUS lsa_QuerySecurity (
-               [in]     policy_handle *handle,
-               [in]         security_secinfo sec_info,
-               [out,unique]        sec_desc_buf *sdbuf
+               [in]            policy_handle *handle,
+               [in]            security_secinfo sec_info,
+               [out,ref]       sec_desc_buf **sdbuf
                );
 
-
        /******************/
        /* Function: 0x04 */
        NTSTATUS lsa_SetSecObj(

diff --git a/source4/torture/rpc/handles.c b/source4/torture/rpc/handles.c
index f35897b3df17ebd4d8a0c896f2cfb995aca7a006..553025276d73b3d19f9a6dc0241716aa35ef2b93 100644 (file)
--- a/source4/torture/rpc/handles.c
+++ b/source4/torture/rpc/handles.c
@@ -109,6 +109,7 @@ static bool test_handles_lsa_shared(struct torture_context *torture)
        struct lsa_OpenPolicy r;
        struct lsa_Close c;
        struct lsa_QuerySecurity qsec;
+       struct sec_desc_buf *sdbuf = NULL;
        uint16_t system_name = '\\';
        TALLOC_CTX *mem_ctx = talloc_new(torture);
        enum dcerpc_transport_t transport;
@@ -167,6 +168,7 @@ static bool test_handles_lsa_shared(struct torture_context *torture)
 
        qsec.in.handle          = &handle;
        qsec.in.sec_info        = 0;
+       qsec.out.sdbuf          = &sdbuf;
        c.in.handle = &handle;
        c.out.handle = &handle2;
 

diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 69df965f1975e105415a1e2e235f094e9d234bac..8ac337c740a8f6147c86c3002cee2b098d1256cf 100644 (file)
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -1462,6 +1462,7 @@ static bool test_QuerySecurity(struct dcerpc_pipe *p,
 {
        NTSTATUS status;
        struct lsa_QuerySecurity r;
+       struct sec_desc_buf *sdbuf = NULL;
 
        if (torture_setting_bool(tctx, "samba4", false)) {
                printf("\nskipping QuerySecurity test against Samba4\n");
@@ -1472,6 +1473,7 @@ static bool test_QuerySecurity(struct dcerpc_pipe *p,
 
        r.in.handle = acct_handle;
        r.in.sec_info = 7;
+       r.out.sdbuf = &sdbuf;
 
        status = dcerpc_lsa_QuerySecurity(p, tctx, &r);
        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 2d2aaa80d6e3633e5f2f5a42625ff67f360af841..257d2c81bce32a81fccbe4ca60223907c693eb9a 100644 (file)
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -204,10 +204,12 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx,
                                                       struct policy_handle *handle) 
 {
        struct lsa_QuerySecurity r;
+       struct sec_desc_buf *sdbuf = NULL;
        NTSTATUS status;
 
        r.in.handle = handle;
        r.in.sec_info = 0x7;
+       r.out.sdbuf = &sdbuf;
 
        status = dcerpc_lsa_QuerySecurity(samsync_state->p_lsa, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -215,7 +217,7 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
-       return r.out.sdbuf;
+       return sdbuf;
 }
 
 #define TEST_UINT64_EQUAL(i1, i2) do {\