The branch, master has been updated
via c14b2eb8ddba17b6e349038671124e70a66e6723 (commit)
via 1c3a70693203903ae86e9f9b251ac474064b4abd (commit)
from cc48e9a01a70dba899cb222c68a4b4e241249329 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c14b2eb8ddba17b6e349038671124e70a66e6723
Author: Stefan Metzmacher <me...@samba.org>
Date: Sun Sep 20 06:37:24 2009 +0200
librpc: rerun 'make idl'
metze
commit 1c3a70693203903ae86e9f9b251ac474064b4abd
Author: Stefan Metzmacher <me...@samba.org>
Date: Sun Sep 20 06:36:39 2009 +0200
drsblobs.idl: fix repsFromTo2 blob size calculation
metze
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/drsblobs.h | 2 +-
librpc/gen_ndr/ndr_drsblobs.c | 4 ++--
librpc/idl/drsblobs.idl | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/drsblobs.h b/librpc/gen_ndr/drsblobs.h
index b1b9192..64f6ce8 100644
--- a/librpc/gen_ndr/drsblobs.h
+++ b/librpc/gen_ndr/drsblobs.h
@@ -91,7 +91,7 @@ struct repsFromTo2OtherInfo {
}/* [relative_base,gensize,public] */;
struct repsFromTo2 {
- uint32_t blobsize;/*
[value(ndr_size_repsFromTo1(this,ndr->iconv_convenience,ndr->flags)+8)] */
+ uint32_t blobsize;/*
[value(ndr_size_repsFromTo2(this,ndr->iconv_convenience,ndr->flags)+8)] */
uint32_t consecutive_sync_failures;
NTTIME last_success;
NTTIME last_attempt;
diff --git a/librpc/gen_ndr/ndr_drsblobs.c b/librpc/gen_ndr/ndr_drsblobs.c
index af57cb3..5b57b36 100644
--- a/librpc/gen_ndr/ndr_drsblobs.c
+++ b/librpc/gen_ndr/ndr_drsblobs.c
@@ -764,7 +764,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_repsFromTo2(struct
ndr_push *ndr, int ndr_fl
ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 8));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_size_repsFromTo1(r, ndr->iconv_convenience, ndr->flags) + 8));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_size_repsFromTo2(r, ndr->iconv_convenience, ndr->flags) + 8));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->consecutive_sync_failures));
NDR_CHECK(ndr_push_NTTIME_1sec(ndr, NDR_SCALARS,
r->last_success));
NDR_CHECK(ndr_push_NTTIME_1sec(ndr, NDR_SCALARS,
r->last_attempt));
@@ -846,7 +846,7 @@ _PUBLIC_ void ndr_print_repsFromTo2(struct ndr_print *ndr,
const char *name, con
uint32_t _flags_save_STRUCT = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
ndr->depth++;
- ndr_print_uint32(ndr, "blobsize", (ndr->flags &
LIBNDR_PRINT_SET_VALUES)?ndr_size_repsFromTo1(r, ndr->iconv_convenience,
ndr->flags) + 8:r->blobsize);
+ ndr_print_uint32(ndr, "blobsize", (ndr->flags &
LIBNDR_PRINT_SET_VALUES)?ndr_size_repsFromTo2(r, ndr->iconv_convenience,
ndr->flags) + 8:r->blobsize);
ndr_print_uint32(ndr, "consecutive_sync_failures",
r->consecutive_sync_failures);
ndr_print_NTTIME_1sec(ndr, "last_success", r->last_success);
ndr_print_NTTIME_1sec(ndr, "last_attempt", r->last_attempt);
diff --git a/librpc/idl/drsblobs.idl b/librpc/idl/drsblobs.idl
index 0c5f8ea..68e9fd5 100644
--- a/librpc/idl/drsblobs.idl
+++ b/librpc/idl/drsblobs.idl
@@ -120,7 +120,7 @@ interface drsblobs {
typedef [public,gensize,flag(NDR_PAHEX)] struct {
/* this includes the 8 bytes of the repsFromToBlob header */
- [value(ndr_size_repsFromTo1(this, ndr->iconv_convenience,
ndr->flags)+8)] uint32 blobsize;
+ [value(ndr_size_repsFromTo2(this, ndr->iconv_convenience,
ndr->flags)+8)] uint32 blobsize;
uint32 consecutive_sync_failures;
NTTIME_1sec last_success;
NTTIME_1sec last_attempt;
--
Samba Shared Repository
