[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-3393-g42f3d68
Michael Adam
obnox at samba.org
Tue Jul 22 14:29:13 GMT 2008
The branch, v3-3-test has been updated
via 42f3d681cac4a443347d1ed253848d45f8746f89 (commit)
via d08e8c4738cfd7785d3b9a2c828c27cc8bc0c6f7 (commit)
via 5c2119ba63a5a119e1b8f055779e5c398333f177 (commit)
from 591bf1d15ff3b93db908cc3a4b6e10d09e5b74b6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 42f3d681cac4a443347d1ed253848d45f8746f89
Author: Michael Adam <obnox at samba.org>
Date: Tue Jul 22 16:18:03 2008 +0200
Change occurrences of the u1 member of DsBindInfo* to pid after idl change.
Michael
commit d08e8c4738cfd7785d3b9a2c828c27cc8bc0c6f7
Author: Michael Adam <obnox at samba.org>
Date: Tue Jul 22 16:15:15 2008 +0200
re-run "make idl" after changing u1 member to pid in DsBindInfo*.
Michael
commit 5c2119ba63a5a119e1b8f055779e5c398333f177
Author: Michael Adam <obnox at samba.org>
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/libnet/libnet_dssync.c | 2 +-
source/librpc/gen_ndr/drsuapi.h | 6 +++---
source/librpc/gen_ndr/ndr_drsuapi.c | 18 +++++++++---------
source/librpc/idl/drsuapi.idl | 8 ++++----
source/rpcclient/cmd_drsuapi.c | 2 +-
5 files changed, 18 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libnet/libnet_dssync.c b/source/libnet/libnet_dssync.c
index 9abff69..b55e6d1 100644
--- a/source/libnet/libnet_dssync.c
+++ b/source/libnet/libnet_dssync.c
@@ -221,7 +221,7 @@ static NTSTATUS libnet_dssync_bind(TALLOC_CTX *mem_ctx,
info28.supported_extensions |= DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7;
info28.supported_extensions |= DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT;
info28.site_guid = GUID_zero();
- info28.u1 = 508;
+ info28.pid = 508;
info28.repl_epoch = 0;
bind_info.length = 28;
diff --git a/source/librpc/gen_ndr/drsuapi.h b/source/librpc/gen_ndr/drsuapi.h
index a1b4cc9..049c2bf 100644
--- a/source/librpc/gen_ndr/drsuapi.h
+++ b/source/librpc/gen_ndr/drsuapi.h
@@ -56,20 +56,20 @@
struct drsuapi_DsBindInfo24 {
uint32_t supported_extensions;
struct GUID site_guid;
- uint32_t u1;
+ uint32_t pid;
};
struct drsuapi_DsBindInfo28 {
uint32_t supported_extensions;
struct GUID site_guid;
- uint32_t u1;
+ uint32_t pid;
uint32_t repl_epoch;
};
struct drsuapi_DsBindInfo48 {
uint32_t supported_extensions;
struct GUID site_guid;
- uint32_t u1;
+ uint32_t pid;
uint32_t repl_epoch;
uint32_t supported_extensions_ext;
struct GUID config_dn_guid;
diff --git a/source/librpc/gen_ndr/ndr_drsuapi.c b/source/librpc/gen_ndr/ndr_drsuapi.c
index 69c2c8a..38b88f6 100644
--- a/source/librpc/gen_ndr/ndr_drsuapi.c
+++ b/source/librpc/gen_ndr/ndr_drsuapi.c
@@ -91,7 +91,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsBindInfo24(struct ndr_push *ndr, int
NDR_CHECK(ndr_push_align(ndr, 4));
NDR_CHECK(ndr_push_drsuapi_SupportedExtensions(ndr, NDR_SCALARS, r->supported_extensions));
NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->site_guid));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->u1));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->pid));
}
if (ndr_flags & NDR_BUFFERS) {
}
@@ -104,7 +104,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsBindInfo24(struct ndr_pull *ndr, int
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_drsuapi_SupportedExtensions(ndr, NDR_SCALARS, &r->supported_extensions));
NDR_CHECK(ndr_pull_GUID(ndr, NDR_SCALARS, &r->site_guid));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->u1));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->pid));
}
if (ndr_flags & NDR_BUFFERS) {
}
@@ -117,7 +117,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsBindInfo24(struct ndr_print *ndr, const char *
ndr->depth++;
ndr_print_drsuapi_SupportedExtensions(ndr, "supported_extensions", r->supported_extensions);
ndr_print_GUID(ndr, "site_guid", &r->site_guid);
- ndr_print_uint32(ndr, "u1", r->u1);
+ ndr_print_uint32(ndr, "pid", r->pid);
ndr->depth--;
}
@@ -127,7 +127,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsBindInfo28(struct ndr_push *ndr, int
NDR_CHECK(ndr_push_align(ndr, 4));
NDR_CHECK(ndr_push_drsuapi_SupportedExtensions(ndr, NDR_SCALARS, r->supported_extensions));
NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->site_guid));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->u1));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->pid));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->repl_epoch));
}
if (ndr_flags & NDR_BUFFERS) {
@@ -141,7 +141,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsBindInfo28(struct ndr_pull *ndr, int
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_drsuapi_SupportedExtensions(ndr, NDR_SCALARS, &r->supported_extensions));
NDR_CHECK(ndr_pull_GUID(ndr, NDR_SCALARS, &r->site_guid));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->u1));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->pid));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->repl_epoch));
}
if (ndr_flags & NDR_BUFFERS) {
@@ -155,7 +155,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsBindInfo28(struct ndr_print *ndr, const char *
ndr->depth++;
ndr_print_drsuapi_SupportedExtensions(ndr, "supported_extensions", r->supported_extensions);
ndr_print_GUID(ndr, "site_guid", &r->site_guid);
- ndr_print_uint32(ndr, "u1", r->u1);
+ ndr_print_uint32(ndr, "pid", r->pid);
ndr_print_uint32(ndr, "repl_epoch", r->repl_epoch);
ndr->depth--;
}
@@ -166,7 +166,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsBindInfo48(struct ndr_push *ndr, int
NDR_CHECK(ndr_push_align(ndr, 4));
NDR_CHECK(ndr_push_drsuapi_SupportedExtensions(ndr, NDR_SCALARS, r->supported_extensions));
NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->site_guid));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->u1));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->pid));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->repl_epoch));
NDR_CHECK(ndr_push_drsuapi_SupportedExtensionsExt(ndr, NDR_SCALARS, r->supported_extensions_ext));
NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->config_dn_guid));
@@ -182,7 +182,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsBindInfo48(struct ndr_pull *ndr, int
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_drsuapi_SupportedExtensions(ndr, NDR_SCALARS, &r->supported_extensions));
NDR_CHECK(ndr_pull_GUID(ndr, NDR_SCALARS, &r->site_guid));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->u1));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->pid));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->repl_epoch));
NDR_CHECK(ndr_pull_drsuapi_SupportedExtensionsExt(ndr, NDR_SCALARS, &r->supported_extensions_ext));
NDR_CHECK(ndr_pull_GUID(ndr, NDR_SCALARS, &r->config_dn_guid));
@@ -198,7 +198,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsBindInfo48(struct ndr_print *ndr, const char *
ndr->depth++;
ndr_print_drsuapi_SupportedExtensions(ndr, "supported_extensions", r->supported_extensions);
ndr_print_GUID(ndr, "site_guid", &r->site_guid);
- ndr_print_uint32(ndr, "u1", r->u1);
+ ndr_print_uint32(ndr, "pid", r->pid);
ndr_print_uint32(ndr, "repl_epoch", r->repl_epoch);
ndr_print_drsuapi_SupportedExtensionsExt(ndr, "supported_extensions_ext", r->supported_extensions_ext);
ndr_print_GUID(ndr, "config_dn_guid", &r->config_dn_guid);
diff --git a/source/librpc/idl/drsuapi.idl b/source/librpc/idl/drsuapi.idl
index 43efddd..56dd483 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;
@@ -1469,7 +1469,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/rpcclient/cmd_drsuapi.c b/source/rpcclient/cmd_drsuapi.c
index 1cef6b9..ab77b4c 100644
--- a/source/rpcclient/cmd_drsuapi.c
+++ b/source/rpcclient/cmd_drsuapi.c
@@ -381,7 +381,7 @@ static WERROR cmd_drsuapi_getncchanges(struct rpc_pipe_client *cli,
info28.supported_extensions |= DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7;
info28.supported_extensions |= DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT;
info28.site_guid = GUID_zero();
- info28.u1 = 508;
+ info28.pid = 508;
info28.repl_epoch = 0;
bind_info.length = 28;
--
Samba Shared Repository
More information about the samba-cvs
mailing list