[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-232-g7dee6fb

[Stefan Metzmacher]

The branch, v4-0-test has been updated
       via  7dee6fb62d5adbd2eaaaf4d8ba9e87a72ef9f94b (commit)
       via  a4c81ee68c91b2d7a9abe668e8b23246c5c9b00d (commit)
      from  bde2496e6b7034c99243b22434a97aebeb8f75b9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 7dee6fb62d5adbd2eaaaf4d8ba9e87a72ef9f94b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Aug 7 19:15:30 2008 +0200

    drsuapi: fix callers after idl change
    
    metze

commit a4c81ee68c91b2d7a9abe668e8b23246c5c9b00d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Aug 7 16:15:26 2008 +0000

    drsuapi.idl: directly use mszip in level 2
    
    This fixes the push because the switch_level doesn't work
    otherwise because the pointer is the same as for
    the outer switch_level.
    
    metze

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

Summary of changes:
 source/dsdb/repl/drepl_out_helpers.c |    2 +-
 source/libnet/libnet_become_dc.c     |    2 +-
 source/librpc/idl/drsuapi.idl        |    8 +-------
 source/torture/rpc/dssync.c          |    2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/dsdb/repl/drepl_out_helpers.c b/source/dsdb/repl/drepl_out_helpers.c
index 345e3db..3629a3b 100644
--- a/source/dsdb/repl/drepl_out_helpers.c
+++ b/source/dsdb/repl/drepl_out_helpers.c
@@ -316,7 +316,7 @@ static void dreplsrv_op_pull_source_get_changes_recv(struct rpc_request *req)
 		ctr1 = &r->out.ctr.ctr1;
 	} else if (*r->out.level == 2) {
 		ctr_level = 1;
-		ctr1 = r->out.ctr.ctr2.ctr.mszip1.ctr1;
+		ctr1 = r->out.ctr.ctr2.mszip1.ctr1;
 	} else if (*r->out.level == 6) {
 		ctr_level = 6;
 		ctr6 = &r->out.ctr.ctr6;
diff --git a/source/libnet/libnet_become_dc.c b/source/libnet/libnet_become_dc.c
index 1ce067c..19391e7 100644
--- a/source/libnet/libnet_become_dc.c
+++ b/source/libnet/libnet_become_dc.c
@@ -2467,7 +2467,7 @@ static WERROR becomeDC_drsuapi_pull_partition_recv(struct libnet_BecomeDC_state
 		ctr1 = &r->out.ctr.ctr1;
 	} else if (*r->out.level == 2) {
 		ctr_level = 1;
-		ctr1 = r->out.ctr.ctr2.ctr.mszip1.ctr1;
+		ctr1 = r->out.ctr.ctr2.mszip1.ctr1;
 	} else if (*r->out.level == 6) {
 		ctr_level = 6;
 		ctr6 = &r->out.ctr.ctr6;
diff --git a/source/librpc/idl/drsuapi.idl b/source/librpc/idl/drsuapi.idl
index c19da4f..88d2126 100644
--- a/source/librpc/idl/drsuapi.idl
+++ b/source/librpc/idl/drsuapi.idl
@@ -662,13 +662,7 @@ interface drsuapi
 	} drsuapi_DsGetNCChangesCompressedCtr;
 
 	typedef struct {
-		/* 
-		 * this is a bit ugly, as the compression depends on the flags
-		 * in the DsBind(), but only w2k uses DsGetNCChangesReq5
-		 * and will get DsGetNCChangesCtr2 replies, and w2k only knowns
-		 * about MSZIP and level 1 replies
-		 */
-		[switch_is(1|(DRSUAPI_COMPRESSION_TYPE_MSZIP<<16))] drsuapi_DsGetNCChangesCompressedCtr ctr;
+		drsuapi_DsGetNCChangesMSZIPCtr1 mszip1;
 	} drsuapi_DsGetNCChangesCtr2;
 
 	typedef struct {
diff --git a/source/torture/rpc/dssync.c b/source/torture/rpc/dssync.c
index d340543..97c3b3f 100644
--- a/source/torture/rpc/dssync.c
+++ b/source/torture/rpc/dssync.c
@@ -748,7 +748,7 @@ static bool test_FetchData(struct torture_context *tctx, struct DsSyncTest *ctx)
 				ctr1 = &r.out.ctr.ctr1;
 			} else if (ret == true && *r.out.level == 2) {
 				out_level = 1;
-				ctr1 = r.out.ctr.ctr2.ctr.mszip1.ctr1;
+				ctr1 = r.out.ctr.ctr2.mszip1.ctr1;
 			}
 
 			if (out_level == 1) {


-- 
Samba Shared Repository