The branch, master has been updated
via e66fa4645a6abcaef2497f4173baae5cbafed571 (commit)
via f21fb4b3958fe630400b145b729c966fa9c053a9 (commit)
from 777143ef53864d9a6e6178bd5015f3183e14077f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e66fa4645a6abcaef2497f4173baae5cbafed571
Author: Andrew Tridgell <[email protected]>
Date: Sat Oct 3 18:13:50 2009 +1000
idl: some lsa vars are uint3264
commit f21fb4b3958fe630400b145b729c966fa9c053a9
Author: Andrew Tridgell <[email protected]>
Date: Sat Oct 3 18:13:25 2009 +1000
pidl: added int3264 as a base type
This is the type used for a variable that is 32 bits for NDR32 and 64
bits for NDR64
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/lsa.idl | 10 +++++-----
librpc/ndr/ndr_basic.c | 10 ++++++++++
pidl/lib/Parse/Pidl/NDR.pm | 2 ++
pidl/lib/Parse/Pidl/Typelist.pm | 2 ++
4 files changed, 19 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl
index 253b6d7..58e0ea9 100644
--- a/librpc/idl/lsa.idl
+++ b/librpc/idl/lsa.idl
@@ -113,14 +113,14 @@ import "misc.idl", "security.idl";
/******************/
/* Function: 0x06 */
typedef struct {
- uint32 len; /* ignored */
+ uint3264 len; /* ignored */
uint16 impersonation_level;
uint8 context_mode;
uint8 effective_only;
} lsa_QosInfo;
typedef struct {
- uint32 len; /* ignored */
+ uint3264 len; /* ignored */
uint8 *root_dir;
[string,charset(UTF16)] uint16 *object_name;
uint32 attributes;
@@ -628,8 +628,8 @@ import "misc.idl", "security.idl";
);
typedef [flag(NDR_PAHEX)] struct {
- uint32 length;
- uint32 size;
+ uint3264 length;
+ uint3264 size;
[size_is(size),length_is(length)] uint8 *data;
} lsa_DATA_BUF;
@@ -1220,7 +1220,7 @@ import "misc.idl", "security.idl";
/* Function 0x49 */
typedef struct {
- [range(0,131072)] uint32 length;
+ [range(0,131072)] uint3264 length;
[size_is(length)] uint8 *data;
} lsa_ForestTrustBinaryData;
diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index 807db59..1a19cc9 100644
--- a/librpc/ndr/ndr_basic.c
+++ b/librpc/ndr/ndr_basic.c
@@ -842,6 +842,16 @@ _PUBLIC_ void ndr_print_uint32(struct ndr_print *ndr,
const char *name, uint32_t
ndr->print(ndr, "%-25s: 0x%08x (%u)", name, v, v);
}
+_PUBLIC_ void ndr_print_int3264(struct ndr_print *ndr, const char *name,
int32_t v)
+{
+ ndr->print(ndr, "%-25s: %d", name, v);
+}
+
+_PUBLIC_ void ndr_print_uint3264(struct ndr_print *ndr, const char *name,
uint32_t v)
+{
+ ndr->print(ndr, "%-25s: 0x%08x (%u)", name, v, v);
+}
+
_PUBLIC_ void ndr_print_udlong(struct ndr_print *ndr, const char *name,
uint64_t v)
{
ndr->print(ndr, "%-25s: 0x%016llx (%llu)", name, (unsigned long long)v,
(unsigned long long)v);
diff --git a/pidl/lib/Parse/Pidl/NDR.pm b/pidl/lib/Parse/Pidl/NDR.pm
index 4f2578e..7c0f7bb 100644
--- a/pidl/lib/Parse/Pidl/NDR.pm
+++ b/pidl/lib/Parse/Pidl/NDR.pm
@@ -52,6 +52,8 @@ my $scalar_alignment = {
'uint16' => 2,
'int32' => 4,
'uint32' => 4,
+ 'int3264' => 5,
+ 'uint3264' => 5,
'hyper' => 8,
'double' => 8,
'pointer' => 8,
diff --git a/pidl/lib/Parse/Pidl/Typelist.pm b/pidl/lib/Parse/Pidl/Typelist.pm
index 12ffa92..55041a9 100644
--- a/pidl/lib/Parse/Pidl/Typelist.pm
+++ b/pidl/lib/Parse/Pidl/Typelist.pm
@@ -34,6 +34,8 @@ my %scalars = (
"uint16" => "uint16_t",
"int32" => "int32_t",
"uint32" => "uint32_t",
+ "int3264" => "int32_t",
+ "uint3264" => "uint32_t",
"hyper" => "uint64_t",
"dlong" => "int64_t",
"udlong" => "uint64_t",
--
Samba Shared Repository
