r2888: - add 'Ds' prefix to Bind and Unbind call on drsuapi
authorStefan Metzmacher <metze@samba.org>
Sun, 10 Oct 2004 01:30:54 +0000 (01:30 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:59:42 +0000 (12:59 -0500)
- rename handle -> bind_handle

- change function types to NTSTATUS

metze
(This used to be commit de73676342be8dbf39df8d3fe68817932ee71ccb)

source4/librpc/idl/drsuapi.idl
source4/torture/rpc/autoidl.c
source4/torture/rpc/drsuapi.c

index 93a7caa48c5ace34687ad3131a8f4f3aaabc85c9..74ed5ed1e8df9955e4760f209b2179f084a2907b 100644 (file)
@@ -17,108 +17,108 @@ interface drsuapi
                [size_is(length)] uint8 data[];
        } drsuapi_BindInfo;
 
-       NTSTATUS drsuapi_Bind(
+       NTSTATUS drsuapi_DsBind(
                [in]        GUID *server_guid,
                [in]        uint32 unknown,
                [out]       drsuapi_BindInfo *info,
-               [out,ref]   policy_handle *handle
+               [out,ref]   policy_handle *bind_handle
                );
 
        /*****************/
         /* Function 0x01 */
-       NTSTATUS drsuapi_Unbind(
-               [in,out,ref] policy_handle *handle
+       NTSTATUS drsuapi_DsUnbind(
+               [in,out,ref] policy_handle *bind_handle
                );
 
        /*****************/
         /* Function 0x02 */
-       void DRSUAPI_REPLICA_SYNC();
+       NTSTATUS DRSUAPI_REPLICA_SYNC();
 
        /*****************/
         /* Function 0x03 */
-       void DRSUAPI_GET_NC_CHANGES();
+       NTSTATUS DRSUAPI_GET_NC_CHANGES();
 
        /*****************/
         /* Function 0x04 */
-       void DRSUAPI_UPDATE_REFS();
+       NTSTATUS DRSUAPI_UPDATE_REFS();
 
        /*****************/
         /* Function 0x05 */
-       void DRSUAPI_REPLICA_ADD();
+       NTSTATUS DRSUAPI_REPLICA_ADD();
 
        /*****************/
         /* Function 0x06 */
-       void DRSUAPI_REPLICA_DEL();
+       NTSTATUS DRSUAPI_REPLICA_DEL();
 
        /*****************/
         /* Function 0x07 */
-       void DRSUAPI_REPLICA_MODIFY();
+       NTSTATUS DRSUAPI_REPLICA_MODIFY();
 
        /*****************/
         /* Function 0x08 */
-       void DRSUAPI_VERIFY_NAMES();
+       NTSTATUS DRSUAPI_VERIFY_NAMES();
 
        /*****************/
         /* Function 0x09 */
-       void DRSUAPI_GET_MEMBERSHIPS();
+       NTSTATUS DRSUAPI_GET_MEMBERSHIPS();
 
        /*****************/
         /* Function 0x0a */
-       void DRSUAPI_INTER_DOMAIN_MOVE();
+       NTSTATUS DRSUAPI_INTER_DOMAIN_MOVE();
 
        /*****************/
         /* Function 0x0b */
-       void DRSUAPI_GET_NT4_CHANGELOG();
+       NTSTATUS DRSUAPI_GET_NT4_CHANGELOG();
 
        /*****************/
         /* Function 0x0c */
-       void DRSUAPI_CRACKNAMES();
+       NTSTATUS DRSUAPI_CRACKNAMES();
 
        /*****************/
         /* Function 0x0d */
-       void DRSUAPI_WRITE_SPN();
+       NTSTATUS DRSUAPI_WRITE_SPN();
 
        /*****************/
         /* Function 0x0e */
-       void DRSUAPI_REMOVE_DS_SERVER();
+       NTSTATUS DRSUAPI_REMOVE_DS_SERVER();
 
        /*****************/
         /* Function 0x0f */
-       void DRSUAPI_REMOVE_DS_DOMAIN();
+       NTSTATUS DRSUAPI_REMOVE_DS_DOMAIN();
 
        /*****************/
         /* Function 0x10 */
-       void DRSUAPI_DOMAIN_CONTROLLER_INFO();
+       NTSTATUS DRSUAPI_DOMAIN_CONTROLLER_INFO();
 
        /*****************/
         /* Function 0x11 */
-       void DRSUAPI_ADD_ENTRY();
+       NTSTATUS DRSUAPI_ADD_ENTRY();
 
        /*****************/
         /* Function 0x12 */
-       void DRSUAPI_EXECUTE_KCC();
+       NTSTATUS DRSUAPI_EXECUTE_KCC();
 
        /*****************/
         /* Function 0x13 */
-       void DRSUAPI_GET_REPL_INFO();
+       NTSTATUS DRSUAPI_GET_REPL_INFO();
 
        /*****************/
         /* Function 0x14 */
-       void DRSUAPI_ADD_SID_HISTORY();
+       NTSTATUS DRSUAPI_ADD_SID_HISTORY();
 
        /*****************/
         /* Function 0x15 */
-       void DRSUAPI_GET_MEMBERSHIPS2();
+       NTSTATUS DRSUAPI_GET_MEMBERSHIPS2();
 
        /*****************/
         /* Function 0x16 */
-       void DRSUAPI_REPLICA_VERIFY_OBJECTS();
+       NTSTATUS DRSUAPI_REPLICA_VERIFY_OBJECTS();
 
        /*****************/
         /* Function 0x17 */
-       void DRSUAPI_GET_OBJECT_EXISTENCE();
+       NTSTATUS DRSUAPI_GET_OBJECT_EXISTENCE();
 
        /*****************/
         /* Function 0x18 */
-       void DRSUAPI_QUERY_SITES_BY_COST();
+       NTSTATUS DRSUAPI_QUERY_SITES_BY_COST();
 }
index 44e0edb1c3a764bc3436615cc71d357367fce730..8ec4a19787abe2851d51b728bfca4ec060d642c6 100644 (file)
@@ -32,14 +32,14 @@ static BOOL get_policy_handle(struct dcerpc_pipe *p,
                              struct policy_handle *handle)
 {
        NTSTATUS status;
-       struct drsuapi_Bind r;
+       struct drsuapi_DsBind r;
 
        ZERO_STRUCT(r);
-       r.out.handle = handle;
+       r.out.bind_handle = handle;
 
-       status = dcerpc_drsuapi_Bind(p, mem_ctx, &r);
+       status = dcerpc_drsuapi_DsBind(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("drsuapi_Bind failed - %s\n", nt_errstr(status));
+               printf("drsuapi_DsBind failed - %s\n", nt_errstr(status));
                return False;
        }
 
index 309427048fc61458b25cc5c4fd6e35b21c6b037e..907183083b8c207c17d8489908b86e366ba0acf1 100644 (file)
 
 #define TEST_MACHINE_NAME "torturetest"
 
-static BOOL test_Bind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                     struct policy_handle *handle)
+static BOOL test_DsBind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                     struct policy_handle *bind_handle)
 {
        NTSTATUS status;
-       struct drsuapi_Bind r;
+       struct drsuapi_DsBind r;
        BOOL ret = True;
 
        ZERO_STRUCT(r);
-       r.out.handle = handle;
+       r.out.bind_handle = bind_handle;
 
-       status = dcerpc_drsuapi_Bind(p, mem_ctx, &r);
+       status = dcerpc_drsuapi_DsBind(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                const char *errstr = nt_errstr(status);
                if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                        errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
                }
-               printf("drsuapi_Bind level failed - %s\n", errstr);
+               printf("drsuapi_DsBind failed - %s\n", errstr);
                ret = False;
        }
 
        return ret;
 }
 
-static BOOL test_Unbind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                       struct policy_handle *handle)
+static BOOL test_DsUnbind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                       struct policy_handle *bind_handle)
 {
        NTSTATUS status;
-       struct drsuapi_Unbind r;
+       struct drsuapi_DsUnbind r;
        BOOL ret = True;
 
-       r.in.handle = handle;
-       r.out.handle = handle;
+       r.in.bind_handle = bind_handle;
+       r.out.bind_handle = bind_handle;
 
-       status = dcerpc_drsuapi_Unbind(p, mem_ctx, &r);
+       status = dcerpc_drsuapi_DsUnbind(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                const char *errstr = nt_errstr(status);
                if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
                        errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
                }
-               printf("drsuapi_Unbind level failed - %s\n", errstr);
+               printf("drsuapi_DsUnbind failed - %s\n", errstr);
                ret = False;
        }
 
@@ -77,7 +77,7 @@ BOOL torture_rpc_drsuapi(int dummy)
         struct dcerpc_pipe *p;
        TALLOC_CTX *mem_ctx;
        BOOL ret = True;
-       struct policy_handle handle;
+       struct policy_handle bind_handle;
 
        status = torture_rpc_connection(&p, 
                                        DCERPC_DRSUAPI_NAME,
@@ -91,11 +91,11 @@ BOOL torture_rpc_drsuapi(int dummy)
 
        mem_ctx = talloc_init("torture_rpc_drsuapi");
 
-       if (!test_Bind(p, mem_ctx, &handle)) {
+       if (!test_DsBind(p, mem_ctx, &bind_handle)) {
                ret = False;
        }
 
-       if (!test_Unbind(p, mem_ctx, &handle)) {
+       if (!test_DsUnbind(p, mem_ctx, &bind_handle)) {
                ret = False;
        }