The branch, master has been updated
via aa7aa664dcf8753c7d17b39094f6eb981a154756 (commit)
from 39385f559c7529214e71171bcdcd2cdbbbb7485e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit aa7aa664dcf8753c7d17b39094f6eb981a154756
Author: Andrew Tridgell <tri...@samba.org>
Date: Thu Sep 17 00:12:15 2009 -0700
idl: added DRS GetNCChanges level 10
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/drsuapi.h | 18 +++++
librpc/gen_ndr/ndr_drsuapi.c | 172 ++++++++++++++++++++++++++++++++++++++++++
librpc/gen_ndr/ndr_drsuapi.h | 1 +
librpc/idl/drsuapi.idl | 18 +++++
4 files changed, 209 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/drsuapi.h b/librpc/gen_ndr/drsuapi.h
index 2e913e9..971f16d 100644
--- a/librpc/gen_ndr/drsuapi.h
+++ b/librpc/gen_ndr/drsuapi.h
@@ -456,9 +456,27 @@ struct drsuapi_DsGetNCChangesRequest8 {
struct drsuapi_DsReplicaOIDMapping_Ctr mapping_ctr;
};
+struct drsuapi_DsGetNCChangesRequest10 {
+ struct GUID destination_dsa_guid;
+ struct GUID source_dsa_invocation_id;
+ struct drsuapi_DsReplicaObjectIdentifier *naming_context;/* [ref] */
+ struct drsuapi_DsReplicaHighWaterMark highwatermark;
+ struct drsuapi_DsReplicaCursorCtrEx *uptodateness_vector;/* [unique] */
+ uint32_t replica_flags;
+ uint32_t max_object_count;
+ uint32_t max_ndr_size;
+ enum drsuapi_DsExtendedOperation extended_op;
+ uint64_t fsmo_info;
+ struct drsuapi_DsPartialAttributeSet *partial_attribute_set;/* [unique]
*/
+ struct drsuapi_DsPartialAttributeSet *partial_attribute_set_ex;/*
[unique] */
+ struct drsuapi_DsReplicaOIDMapping_Ctr mapping_ctr;
+ uint32_t more_flags;
+};
+
union drsuapi_DsGetNCChangesRequest {
struct drsuapi_DsGetNCChangesRequest5 req5;/* [case(5)] */
struct drsuapi_DsGetNCChangesRequest8 req8;/* [case(8)] */
+ struct drsuapi_DsGetNCChangesRequest10 req10;/* [case(10)] */
}/* [switch_type(int32)] */;
struct drsuapi_DsReplicaCursor2 {
diff --git a/librpc/gen_ndr/ndr_drsuapi.c b/librpc/gen_ndr/ndr_drsuapi.c
index f5d2d17..a48e80f 100644
--- a/librpc/gen_ndr/ndr_drsuapi.c
+++ b/librpc/gen_ndr/ndr_drsuapi.c
@@ -1548,6 +1548,158 @@ _PUBLIC_ void
ndr_print_drsuapi_DsGetNCChangesRequest8(struct ndr_print *ndr, co
ndr->depth--;
}
+static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesRequest10(struct
ndr_push *ndr, int ndr_flags, const struct drsuapi_DsGetNCChangesRequest10 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 8));
+ NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS,
&r->destination_dsa_guid));
+ NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS,
&r->source_dsa_invocation_id));
+ if (r->naming_context == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
+ NDR_CHECK(ndr_push_ref_ptr(ndr));
+ NDR_CHECK(ndr_push_drsuapi_DsReplicaHighWaterMark(ndr,
NDR_SCALARS, &r->highwatermark));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->uptodateness_vector));
+ NDR_CHECK(ndr_push_drsuapi_DsReplicaNeighbourFlags(ndr,
NDR_SCALARS, r->replica_flags));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->max_object_count));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->max_ndr_size));
+ NDR_CHECK(ndr_push_drsuapi_DsExtendedOperation(ndr,
NDR_SCALARS, r->extended_op));
+ NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->fsmo_info));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->partial_attribute_set));
+ NDR_CHECK(ndr_push_unique_ptr(ndr,
r->partial_attribute_set_ex));
+ NDR_CHECK(ndr_push_drsuapi_DsReplicaOIDMapping_Ctr(ndr,
NDR_SCALARS, &r->mapping_ctr));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->more_flags));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ NDR_CHECK(ndr_push_drsuapi_DsReplicaObjectIdentifier(ndr,
NDR_SCALARS|NDR_BUFFERS, r->naming_context));
+ if (r->uptodateness_vector) {
+ NDR_CHECK(ndr_push_drsuapi_DsReplicaCursorCtrEx(ndr,
NDR_SCALARS, r->uptodateness_vector));
+ }
+ if (r->partial_attribute_set) {
+ NDR_CHECK(ndr_push_drsuapi_DsPartialAttributeSet(ndr,
NDR_SCALARS, r->partial_attribute_set));
+ }
+ if (r->partial_attribute_set_ex) {
+ NDR_CHECK(ndr_push_drsuapi_DsPartialAttributeSet(ndr,
NDR_SCALARS, r->partial_attribute_set_ex));
+ }
+ NDR_CHECK(ndr_push_drsuapi_DsReplicaOIDMapping_Ctr(ndr,
NDR_BUFFERS, &r->mapping_ctr));
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesRequest10(struct
ndr_pull *ndr, int ndr_flags, struct drsuapi_DsGetNCChangesRequest10 *r)
+{
+ uint32_t _ptr_naming_context;
+ TALLOC_CTX *_mem_save_naming_context_0;
+ uint32_t _ptr_uptodateness_vector;
+ TALLOC_CTX *_mem_save_uptodateness_vector_0;
+ uint32_t _ptr_partial_attribute_set;
+ TALLOC_CTX *_mem_save_partial_attribute_set_0;
+ uint32_t _ptr_partial_attribute_set_ex;
+ TALLOC_CTX *_mem_save_partial_attribute_set_ex_0;
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 8));
+ NDR_CHECK(ndr_pull_GUID(ndr, NDR_SCALARS,
&r->destination_dsa_guid));
+ NDR_CHECK(ndr_pull_GUID(ndr, NDR_SCALARS,
&r->source_dsa_invocation_id));
+ NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_naming_context));
+ if (_ptr_naming_context) {
+ NDR_PULL_ALLOC(ndr, r->naming_context);
+ } else {
+ r->naming_context = NULL;
+ }
+ NDR_CHECK(ndr_pull_drsuapi_DsReplicaHighWaterMark(ndr,
NDR_SCALARS, &r->highwatermark));
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_uptodateness_vector));
+ if (_ptr_uptodateness_vector) {
+ NDR_PULL_ALLOC(ndr, r->uptodateness_vector);
+ } else {
+ r->uptodateness_vector = NULL;
+ }
+ NDR_CHECK(ndr_pull_drsuapi_DsReplicaNeighbourFlags(ndr,
NDR_SCALARS, &r->replica_flags));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->max_object_count));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->max_ndr_size));
+ NDR_CHECK(ndr_pull_drsuapi_DsExtendedOperation(ndr,
NDR_SCALARS, &r->extended_op));
+ NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->fsmo_info));
+ NDR_CHECK(ndr_pull_generic_ptr(ndr,
&_ptr_partial_attribute_set));
+ if (_ptr_partial_attribute_set) {
+ NDR_PULL_ALLOC(ndr, r->partial_attribute_set);
+ } else {
+ r->partial_attribute_set = NULL;
+ }
+ NDR_CHECK(ndr_pull_generic_ptr(ndr,
&_ptr_partial_attribute_set_ex));
+ if (_ptr_partial_attribute_set_ex) {
+ NDR_PULL_ALLOC(ndr, r->partial_attribute_set_ex);
+ } else {
+ r->partial_attribute_set_ex = NULL;
+ }
+ NDR_CHECK(ndr_pull_drsuapi_DsReplicaOIDMapping_Ctr(ndr,
NDR_SCALARS, &r->mapping_ctr));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->more_flags));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ _mem_save_naming_context_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->naming_context, 0);
+ NDR_CHECK(ndr_pull_drsuapi_DsReplicaObjectIdentifier(ndr,
NDR_SCALARS|NDR_BUFFERS, r->naming_context));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_naming_context_0, 0);
+ if (r->uptodateness_vector) {
+ _mem_save_uptodateness_vector_0 =
NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->uptodateness_vector, 0);
+ NDR_CHECK(ndr_pull_drsuapi_DsReplicaCursorCtrEx(ndr,
NDR_SCALARS, r->uptodateness_vector));
+ NDR_PULL_SET_MEM_CTX(ndr,
_mem_save_uptodateness_vector_0, 0);
+ }
+ if (r->partial_attribute_set) {
+ _mem_save_partial_attribute_set_0 =
NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->partial_attribute_set, 0);
+ NDR_CHECK(ndr_pull_drsuapi_DsPartialAttributeSet(ndr,
NDR_SCALARS, r->partial_attribute_set));
+ NDR_PULL_SET_MEM_CTX(ndr,
_mem_save_partial_attribute_set_0, 0);
+ }
+ if (r->partial_attribute_set_ex) {
+ _mem_save_partial_attribute_set_ex_0 =
NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->partial_attribute_set_ex,
0);
+ NDR_CHECK(ndr_pull_drsuapi_DsPartialAttributeSet(ndr,
NDR_SCALARS, r->partial_attribute_set_ex));
+ NDR_PULL_SET_MEM_CTX(ndr,
_mem_save_partial_attribute_set_ex_0, 0);
+ }
+ NDR_CHECK(ndr_pull_drsuapi_DsReplicaOIDMapping_Ctr(ndr,
NDR_BUFFERS, &r->mapping_ctr));
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_drsuapi_DsGetNCChangesRequest10(struct ndr_print *ndr,
const char *name, const struct drsuapi_DsGetNCChangesRequest10 *r)
+{
+ ndr_print_struct(ndr, name, "drsuapi_DsGetNCChangesRequest10");
+ ndr->depth++;
+ ndr_print_GUID(ndr, "destination_dsa_guid", &r->destination_dsa_guid);
+ ndr_print_GUID(ndr, "source_dsa_invocation_id",
&r->source_dsa_invocation_id);
+ ndr_print_ptr(ndr, "naming_context", r->naming_context);
+ ndr->depth++;
+ ndr_print_drsuapi_DsReplicaObjectIdentifier(ndr, "naming_context",
r->naming_context);
+ ndr->depth--;
+ ndr_print_drsuapi_DsReplicaHighWaterMark(ndr, "highwatermark",
&r->highwatermark);
+ ndr_print_ptr(ndr, "uptodateness_vector", r->uptodateness_vector);
+ ndr->depth++;
+ if (r->uptodateness_vector) {
+ ndr_print_drsuapi_DsReplicaCursorCtrEx(ndr,
"uptodateness_vector", r->uptodateness_vector);
+ }
+ ndr->depth--;
+ ndr_print_drsuapi_DsReplicaNeighbourFlags(ndr, "replica_flags",
r->replica_flags);
+ ndr_print_uint32(ndr, "max_object_count", r->max_object_count);
+ ndr_print_uint32(ndr, "max_ndr_size", r->max_ndr_size);
+ ndr_print_drsuapi_DsExtendedOperation(ndr, "extended_op",
r->extended_op);
+ ndr_print_hyper(ndr, "fsmo_info", r->fsmo_info);
+ ndr_print_ptr(ndr, "partial_attribute_set", r->partial_attribute_set);
+ ndr->depth++;
+ if (r->partial_attribute_set) {
+ ndr_print_drsuapi_DsPartialAttributeSet(ndr,
"partial_attribute_set", r->partial_attribute_set);
+ }
+ ndr->depth--;
+ ndr_print_ptr(ndr, "partial_attribute_set_ex",
r->partial_attribute_set_ex);
+ ndr->depth++;
+ if (r->partial_attribute_set_ex) {
+ ndr_print_drsuapi_DsPartialAttributeSet(ndr,
"partial_attribute_set_ex", r->partial_attribute_set_ex);
+ }
+ ndr->depth--;
+ ndr_print_drsuapi_DsReplicaOIDMapping_Ctr(ndr, "mapping_ctr",
&r->mapping_ctr);
+ ndr_print_uint32(ndr, "more_flags", r->more_flags);
+ ndr->depth--;
+}
+
static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesRequest(struct
ndr_push *ndr, int ndr_flags, const union drsuapi_DsGetNCChangesRequest *r)
{
if (ndr_flags & NDR_SCALARS) {
@@ -1562,6 +1714,10 @@ static enum ndr_err_code
ndr_push_drsuapi_DsGetNCChangesRequest(struct ndr_push
NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesRequest8(ndr, NDR_SCALARS, &r->req8));
break; }
+ case 10: {
+
NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesRequest10(ndr, NDR_SCALARS,
&r->req10));
+ break; }
+
default:
return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH,
"Bad switch value %u at %s", level, __location__);
}
@@ -1577,6 +1733,10 @@ static enum ndr_err_code
ndr_push_drsuapi_DsGetNCChangesRequest(struct ndr_push
NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesRequest8(ndr, NDR_BUFFERS, &r->req8));
break;
+ case 10:
+
NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesRequest10(ndr, NDR_BUFFERS,
&r->req10));
+ break;
+
default:
return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH,
"Bad switch value %u at %s", level, __location__);
}
@@ -1603,6 +1763,10 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsGetNCChangesRequest(struct ndr_pull
NDR_CHECK(ndr_pull_drsuapi_DsGetNCChangesRequest8(ndr, NDR_SCALARS, &r->req8));
break; }
+ case 10: {
+
NDR_CHECK(ndr_pull_drsuapi_DsGetNCChangesRequest10(ndr, NDR_SCALARS,
&r->req10));
+ break; }
+
default:
return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH,
"Bad switch value %u at %s", level, __location__);
}
@@ -1617,6 +1781,10 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsGetNCChangesRequest(struct ndr_pull
NDR_CHECK(ndr_pull_drsuapi_DsGetNCChangesRequest8(ndr, NDR_BUFFERS, &r->req8));
break;
+ case 10:
+
NDR_CHECK(ndr_pull_drsuapi_DsGetNCChangesRequest10(ndr, NDR_BUFFERS,
&r->req10));
+ break;
+
default:
return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH,
"Bad switch value %u at %s", level, __location__);
}
@@ -1638,6 +1806,10 @@ _PUBLIC_ void
ndr_print_drsuapi_DsGetNCChangesRequest(struct ndr_print *ndr, con
ndr_print_drsuapi_DsGetNCChangesRequest8(ndr, "req8",
&r->req8);
break;
+ case 10:
+ ndr_print_drsuapi_DsGetNCChangesRequest10(ndr, "req10",
&r->req10);
+ break;
+
default:
ndr_print_bad_level(ndr, name, level);
}
diff --git a/librpc/gen_ndr/ndr_drsuapi.h b/librpc/gen_ndr/ndr_drsuapi.h
index 94afb2d..f157cc5 100644
--- a/librpc/gen_ndr/ndr_drsuapi.h
+++ b/librpc/gen_ndr/ndr_drsuapi.h
@@ -105,6 +105,7 @@ enum ndr_err_code ndr_pull_drsuapi_DsAttributeId(struct
ndr_pull *ndr, int ndr_f
void ndr_print_drsuapi_DsAttributeId(struct ndr_print *ndr, const char *name,
enum drsuapi_DsAttributeId r);
void ndr_print_drsuapi_DsPartialAttributeSet(struct ndr_print *ndr, const char
*name, const struct drsuapi_DsPartialAttributeSet *r);
void ndr_print_drsuapi_DsGetNCChangesRequest8(struct ndr_print *ndr, const
char *name, const struct drsuapi_DsGetNCChangesRequest8 *r);
+void ndr_print_drsuapi_DsGetNCChangesRequest10(struct ndr_print *ndr, const
char *name, const struct drsuapi_DsGetNCChangesRequest10 *r);
void ndr_print_drsuapi_DsGetNCChangesRequest(struct ndr_print *ndr, const char
*name, const union drsuapi_DsGetNCChangesRequest *r);
enum ndr_err_code ndr_push_drsuapi_DsReplicaCursor2(struct ndr_push *ndr, int
ndr_flags, const struct drsuapi_DsReplicaCursor2 *r);
enum ndr_err_code ndr_pull_drsuapi_DsReplicaCursor2(struct ndr_pull *ndr, int
ndr_flags, struct drsuapi_DsReplicaCursor2 *r);
diff --git a/librpc/idl/drsuapi.idl b/librpc/idl/drsuapi.idl
index f535763..54abcbd 100644
--- a/librpc/idl/drsuapi.idl
+++ b/librpc/idl/drsuapi.idl
@@ -490,9 +490,27 @@ interface drsuapi
drsuapi_DsReplicaOIDMapping_Ctr mapping_ctr;
} drsuapi_DsGetNCChangesRequest8;
+ typedef struct {
+ GUID destination_dsa_guid;
+ GUID source_dsa_invocation_id; /* the 'invocationId' field of
the CN=NTDS Settings object */
+ [ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
+ drsuapi_DsReplicaHighWaterMark highwatermark;
+ drsuapi_DsReplicaCursorCtrEx *uptodateness_vector;
+ drsuapi_DsReplicaNeighbourFlags replica_flags;
+ uint32 max_object_count; /* w2k3 uses
min(133,max(100,max_object_count)) */
+ uint32 max_ndr_size; /* w2k3 seems to ignore this */
+ drsuapi_DsExtendedOperation extended_op;
+ hyper fsmo_info;
+ drsuapi_DsPartialAttributeSet *partial_attribute_set;
+ drsuapi_DsPartialAttributeSet *partial_attribute_set_ex;
+ drsuapi_DsReplicaOIDMapping_Ctr mapping_ctr;
+ uint32 more_flags;
+ } drsuapi_DsGetNCChangesRequest10;
+
typedef [switch_type(int32)] union {
[case(5)] drsuapi_DsGetNCChangesRequest5 req5;
[case(8)] drsuapi_DsGetNCChangesRequest8 req8;
+ [case(10)] drsuapi_DsGetNCChangesRequest10 req10;
} drsuapi_DsGetNCChangesRequest;
typedef [public] struct {
--
Samba Shared Repository
