The branch, v4-0-test has been updated
via b91bbc5fe4a47e5823be6be5f2f203f1f14105de (commit)
via 579306eb5b58b6c1142b3c489e4bcf6da50810d6 (commit)
from f5afb695045b1a2f3b8c00a4d82d40e8e50726c9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit b91bbc5fe4a47e5823be6be5f2f203f1f14105de
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Tue Jul 22 15:35:23 2008 +0200
Change occurrences of the u1 member of DsBindInfo* to pid after idl change.
Michael
commit 579306eb5b58b6c1142b3c489e4bcf6da50810d6
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Tue Jul 22 15:33:26 2008 +0200
drsuapi.idl: change the u1 field in DsBindInfo* to "pid".
According to the WSPP docs, section 5.35,
this is the "process identifyer" of the client.
It is meant for informational and debugging purposes
only and its assignment is implementation specific.
Michael
-----------------------------------------------------------------------
Summary of changes:
source/dsdb/repl/drepl_out_helpers.c | 2 +-
source/dsdb/repl/drepl_service.c | 2 +-
source/libnet/libnet_become_dc.c | 6 +++---
source/libnet/libnet_unbecome_dc.c | 4 ++--
source/librpc/idl/drsuapi.idl | 8 ++++----
source/rpc_server/drsuapi/dcesrv_drsuapi.c | 15 +++++++++------
source/torture/rpc/dssync.c | 6 +++---
7 files changed, 23 insertions(+), 20 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 281e569..0700867 100644
--- a/source/dsdb/repl/drepl_out_helpers.c
+++ b/source/dsdb/repl/drepl_out_helpers.c
@@ -142,7 +142,7 @@ static void dreplsrv_out_drsuapi_bind_recv(struct
rpc_request *req)
info24 = &st->bind_r.out.bind_info->info.info24;
st->drsuapi->remote_info28.supported_extensions =
info24->supported_extensions;
st->drsuapi->remote_info28.site_guid =
info24->site_guid;
- st->drsuapi->remote_info28.u1 =
info24->u1;
+ st->drsuapi->remote_info28.pid =
info24->pid;
st->drsuapi->remote_info28.repl_epoch = 0;
break;
}
diff --git a/source/dsdb/repl/drepl_service.c b/source/dsdb/repl/drepl_service.c
index e485c50..3611258 100644
--- a/source/dsdb/repl/drepl_service.c
+++ b/source/dsdb/repl/drepl_service.c
@@ -104,7 +104,7 @@ static WERROR dreplsrv_connect_samdb(struct
dreplsrv_service *service, struct lo
/* TODO: fill in site_guid */
bind_info28->site_guid = GUID_zero();
/* TODO: find out how this is really triggered! */
- bind_info28->u1 = 0;
+ bind_info28->pid = 0;
bind_info28->repl_epoch = 0;
return WERR_OK;
diff --git a/source/libnet/libnet_become_dc.c b/source/libnet/libnet_become_dc.c
index 3fece1a..556ba80 100644
--- a/source/libnet/libnet_become_dc.c
+++ b/source/libnet/libnet_become_dc.c
@@ -1604,9 +1604,9 @@ static void becomeDC_drsuapi_bind_send(struct
libnet_BecomeDC_state *s,
bind_info28->site_guid = s->dest_dsa.site_guid;
if (s->domain.behavior_version == 2) {
/* TODO: find out how this is really triggered! */
- bind_info28->u1 = 528;
+ bind_info28->pid = 528;
} else {
- bind_info28->u1 = 516;
+ bind_info28->pid = 516;
}
bind_info28->repl_epoch = 0;
@@ -1636,7 +1636,7 @@ static WERROR becomeDC_drsuapi_bind_recv(struct
libnet_BecomeDC_state *s,
info24 = &drsuapi->bind_r.out.bind_info->info.info24;
drsuapi->remote_info28.supported_extensions =
info24->supported_extensions;
drsuapi->remote_info28.site_guid =
info24->site_guid;
- drsuapi->remote_info28.u1 =
info24->u1;
+ drsuapi->remote_info28.pid =
info24->pid;
drsuapi->remote_info28.repl_epoch = 0;
break;
}
diff --git a/source/libnet/libnet_unbecome_dc.c
b/source/libnet/libnet_unbecome_dc.c
index cff9190..e01af25 100644
--- a/source/libnet/libnet_unbecome_dc.c
+++ b/source/libnet/libnet_unbecome_dc.c
@@ -574,7 +574,7 @@ static void unbecomeDC_drsuapi_bind_send(struct
libnet_UnbecomeDC_state *s)
bind_info28 = &s->drsuapi.local_info28;
bind_info28->supported_extensions = 0;
bind_info28->site_guid = GUID_zero();
- bind_info28->u1 = 508;
+ bind_info28->pid = 508;
bind_info28->repl_epoch = 0;
s->drsuapi.bind_info_ctr.length = 28;
@@ -612,7 +612,7 @@ static void unbecomeDC_drsuapi_bind_recv(struct rpc_request
*req)
info24 = &s->drsuapi.bind_r.out.bind_info->info.info24;
s->drsuapi.remote_info28.supported_extensions =
info24->supported_extensions;
s->drsuapi.remote_info28.site_guid =
info24->site_guid;
- s->drsuapi.remote_info28.u1 =
info24->u1;
+ s->drsuapi.remote_info28.pid =
info24->pid;
s->drsuapi.remote_info28.repl_epoch = 0;
break;
}
diff --git a/source/librpc/idl/drsuapi.idl b/source/librpc/idl/drsuapi.idl
index ee1f5c8..c19da4f 100644
--- a/source/librpc/idl/drsuapi.idl
+++ b/source/librpc/idl/drsuapi.idl
@@ -67,14 +67,14 @@ interface drsuapi
typedef struct {
drsuapi_SupportedExtensions supported_extensions;
GUID site_guid;
- uint32 u1;
+ uint32 pid;
} drsuapi_DsBindInfo24;
/* this is used by w2k3 */
typedef struct {
drsuapi_SupportedExtensions supported_extensions;
GUID site_guid;
- uint32 u1;
+ uint32 pid;
uint32 repl_epoch;
} drsuapi_DsBindInfo28;
@@ -82,7 +82,7 @@ interface drsuapi
typedef struct {
drsuapi_SupportedExtensions supported_extensions;
GUID site_guid;
- uint32 u1;
+ uint32 pid;
uint32 repl_epoch;
drsuapi_SupportedExtensionsExt supported_extensions_ext;
GUID config_dn_guid;
@@ -1425,7 +1425,7 @@ interface drsuapi
GUID bind_guid;
NTTIME_1sec bind_time;
[flag(NDR_BIG_ENDIAN)] ipv4address client_ip_address;
- uint32 u5; /* this is the same value the client used as u1 in
the DsBindInfoX struct */
+ uint32 u5; /* this is the same value the client used as pid in
the DsBindInfoX struct */
} drsuapi_DsReplicaConnection04;
typedef struct {
diff --git a/source/rpc_server/drsuapi/dcesrv_drsuapi.c
b/source/rpc_server/drsuapi/dcesrv_drsuapi.c
index e0a222e..bbb78cb 100644
--- a/source/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -45,7 +45,7 @@ static WERROR dcesrv_drsuapi_DsBind(struct dcesrv_call_state
*dce_call, TALLOC_C
struct ldb_result *ntds_res;
struct ldb_dn *ntds_dn;
static const char *ntds_attrs[] = { "ms-DS-ReplicationEpoch", NULL };
- uint32_t u1;
+ uint32_t pid;
uint32_t repl_epoch;
int ret;
@@ -98,9 +98,12 @@ static WERROR dcesrv_drsuapi_DsBind(struct dcesrv_call_state
*dce_call, TALLOC_C
repl_epoch = samdb_result_uint(ntds_res->msgs[0],
"ms-DS-ReplicationEpoch", 0);
/*
- * TODO: find out what this is...
+ * The "process identifier" of the client.
+ * According to the WSPP docs, sectin 5.35, this is
+ * for informational and debugging purposes only.
+ * The assignment is implementation specific.
*/
- u1 = 0;
+ pid = 0;
/*
* store the clients bind_guid
@@ -119,7 +122,7 @@ static WERROR dcesrv_drsuapi_DsBind(struct
dcesrv_call_state *dce_call, TALLOC_C
info24 = &r->in.bind_info->info.info24;
b_state->remote_info28.supported_extensions =
info24->supported_extensions;
b_state->remote_info28.site_guid =
info24->site_guid;
- b_state->remote_info28.u1 =
info24->u1;
+ b_state->remote_info28.pid =
info24->pid;
b_state->remote_info28.repl_epoch = 0;
break;
}
@@ -171,8 +174,8 @@ static WERROR dcesrv_drsuapi_DsBind(struct
dcesrv_call_state *dce_call, TALLOC_C
b_state->local_info28.supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS;
#endif
b_state->local_info28.site_guid = site_guid;
- b_state->local_info28.u1 = u1;
- b_state->local_info28.repl_epoch = repl_epoch;
+ b_state->local_info28.pid = pid;
+ b_state->local_info28.repl_epoch = repl_epoch;
/*
* allocate the return bind_info
diff --git a/source/torture/rpc/dssync.c b/source/torture/rpc/dssync.c
index 053f78e..35fd4df 100644
--- a/source/torture/rpc/dssync.c
+++ b/source/torture/rpc/dssync.c
@@ -104,7 +104,7 @@ static struct DsSyncTest *test_create_context(struct
torture_context *tctx)
our_bind_info28->supported_extensions = 0xFFFFFFFF;
our_bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_ADDENTRYREPLY_V3;
our_bind_info28->site_guid = GUID_zero();
- our_bind_info28->u1 = 0;
+ our_bind_info28->pid = 0;
our_bind_info28->repl_epoch = 1;
our_bind_info_ctr =
&ctx->admin.drsuapi.our_bind_info_ctr;
@@ -153,7 +153,7 @@ static struct DsSyncTest *test_create_context(struct
torture_context *tctx)
our_bind_info28->supported_extensions |=
DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS;
}
our_bind_info28->site_guid = GUID_zero();
- our_bind_info28->u1 = 508;
+ our_bind_info28->pid = 508;
our_bind_info28->repl_epoch = 0;
our_bind_info_ctr =
&ctx->new_dc.drsuapi.our_bind_info_ctr;
@@ -210,7 +210,7 @@ static bool _test_DsBind(struct torture_context *tctx,
info24 = &b->req.out.bind_info->info.info24;
b->peer_bind_info28.supported_extensions=
info24->supported_extensions;
b->peer_bind_info28.site_guid =
info24->site_guid;
- b->peer_bind_info28.u1 = info24->u1;
+ b->peer_bind_info28.pid = info24->pid;
b->peer_bind_info28.repl_epoch = 0;
break;
}
--
Samba Shared Repository
