[SCM] Samba Shared Repository - branch master updated

[Simo Sorce]

The branch, master has been updated
       via  7d89c7c... idl: fix comment and convert whitespaces to tabs
      from  5592a9b... s4:selftest Test --sign and --encrypt options to ldbsearch

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7d89c7c17bcedd33dae7d3200104dc0643a753f6
Author: Simo Sorce <idra at samba.org>
Date:   Wed Mar 24 07:45:15 2010 -0400

    idl: fix comment and convert whitespaces to tabs

-----------------------------------------------------------------------

Summary of changes:
 librpc/idl/drsblobs.idl |   88 +++++++++++++++++++++++-----------------------
 librpc/idl/idl_types.h  |    2 +-
 2 files changed, 45 insertions(+), 45 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/drsblobs.idl b/librpc/idl/drsblobs.idl
index 0df5bc1..93c44f3 100644
--- a/librpc/idl/drsblobs.idl
+++ b/librpc/idl/drsblobs.idl
@@ -572,53 +572,53 @@ interface drsblobs {
 		[in,subcontext(0xFFFFFC01)] ExtendedErrorInfoPtr ptr
 		);
 
-        /* MS-ADTS 7.1.6.9.3 msDS-TrustForestTrustInfo Attribute */
-
-        typedef [flag(NDR_NOALIGN)] struct {
-                [value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size;
-                [subcontext(0),subcontext_size(sid_size)] dom_sid sid;
-                utf8string2 dns_name;
-                utf8string2 netbios_name;
-        } ForestTrustDataDomainInfo;
-
-        typedef [flag(NDR_NOALIGN)] struct {
-                uint32 size;
-                uint8 data[size];
-        } ForestTrustDataBinaryData;
-
-        typedef [nodiscriminant] union {
-                [case(FOREST_TRUST_TOP_LEVEL_NAME)] utf8string2 name;
-                [case(FOREST_TRUST_TOP_LEVEL_NAME_EX)] utf8string2 name;
-                [case(FOREST_TRUST_DOMAIN_INFO)] ForestTrustDataDomainInfo info;
-                [default] ForestTrustDataBinaryData data;
-        } ForestTrustData;
-
-        /* same as lsa_ForestTrustRecordType */
-        typedef [enum8bit] enum {
+	/* MS-ADTS 7.1.6.9.3 msDS-TrustForestTrustInfo Attribute */
+
+	typedef [flag(NDR_NOALIGN)] struct {
+		[value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size;
+		[subcontext(0),subcontext_size(sid_size)] dom_sid sid;
+		utf8string2 dns_name;
+		utf8string2 netbios_name;
+	} ForestTrustDataDomainInfo;
+
+	typedef [flag(NDR_NOALIGN)] struct {
+		uint32 size;
+		uint8 data[size];
+	} ForestTrustDataBinaryData;
+
+	typedef [nodiscriminant] union {
+		[case(FOREST_TRUST_TOP_LEVEL_NAME)] utf8string2 name;
+		[case(FOREST_TRUST_TOP_LEVEL_NAME_EX)] utf8string2 name;
+		[case(FOREST_TRUST_DOMAIN_INFO)] ForestTrustDataDomainInfo info;
+		[default] ForestTrustDataBinaryData data;
+	} ForestTrustData;
+
+	/* same as lsa_ForestTrustRecordType */
+	typedef [enum8bit] enum {
 		FOREST_TRUST_TOP_LEVEL_NAME = 0,
 		FOREST_TRUST_TOP_LEVEL_NAME_EX = 1,
 		FOREST_TRUST_DOMAIN_INFO = 2
-        } ForestTrustInfoRecordType;
-
-        /* meaning of flags depends on record type and values are
-           the same as in lsa.idl, see collision record types */
-        typedef [public,gensize,flag(NDR_NOALIGN)] struct {
-                uint32 flags;
-                NTTIME timestamp;
-                ForestTrustInfoRecordType type;
-                [switch_is(type)] ForestTrustData data;
-        } ForestTrustInfoRecord;
-
-        typedef [flag(NDR_NOALIGN)] struct {
-                [value(ndr_size_ForestTrustInfoRecord(&record, ndr->iconv_convenience, ndr->flags))] uint32 record_size;
-                ForestTrustInfoRecord record;
-        } ForestTrustInfoRecordArmor;
-
-        typedef [public,flag(NDR_NOALIGN)] struct {
-                uint32 version;
-                uint32 count;
-                ForestTrustInfoRecordArmor records[count];
-        } ForestTrustInfo;
+	} ForestTrustInfoRecordType;
+
+	/* meaning of flags depends on record type and values are
+	   the same as in lsa.idl, see collision record types */
+	typedef [public,gensize,flag(NDR_NOALIGN)] struct {
+		uint32 flags;
+		NTTIME timestamp;
+		ForestTrustInfoRecordType type;
+		[switch_is(type)] ForestTrustData data;
+	} ForestTrustInfoRecord;
+
+	typedef [flag(NDR_NOALIGN)] struct {
+		[value(ndr_size_ForestTrustInfoRecord(&record, ndr->iconv_convenience, ndr->flags))] uint32 record_size;
+		ForestTrustInfoRecord record;
+	} ForestTrustInfoRecordArmor;
+
+	typedef [public,flag(NDR_NOALIGN)] struct {
+		uint32 version;
+		uint32 count;
+		ForestTrustInfoRecordArmor records[count];
+	} ForestTrustInfo;
 
 	void decode_ForestTrustInfo(
 		[in] ForestTrustInfo blob
diff --git a/librpc/idl/idl_types.h b/librpc/idl/idl_types.h
index d763a8b..72165cf 100644
--- a/librpc/idl/idl_types.h
+++ b/librpc/idl/idl_types.h
@@ -48,7 +48,7 @@
 #define utf8string	[flag(STR_UTF8|STR_NULLTERM)] string
 
 /*
-  an utf8 string prefixed with [length], 32 bits
+  an utf8 string prefixed with [size], 32 bits
   not null terminated
 */
 #define utf8string2	[flag(STR_SIZE4|STR_UTF8|STR_NOTERM)] string


-- 
Samba Shared Repository