Changeset 916 for trunk/server/source3/librpc/gen_ndr/drsblobs.h

Timestamp:

Jun 6, 2016, 8:53:52 PM (10 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to version 3.6.25, fix some more crlf issues

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/librpc/gen_ndr/drsblobs.h (modified) (13 diffs)

trunk/server/source3/librpc/gen_ndr/drsblobs.h

@@ -85 +85 @@
         struct GUID source_dsa_invocation_id;
         struct GUID transport_guid;
-}/* [gensize,public,flag(LIBNDR_PRINT_ARRAY_HEX)] */;
+}/* [gensize,] */;
 
 struct repsFromTo2OtherInfo {
@@ -93 +93 @@
         const char * dns_name2;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
         uint64_t unknown2;
-}/* [relative_base,gensize,public] */;
+}/* [] */;
 
 struct repsFromTo2 {
@@ -111 +111 @@
         struct GUID transport_guid;
         uint64_t unknown1;
-}/* [gensize,public,flag(LIBNDR_PRINT_ARRAY_HEX)] */;
+}/* [] */;
 
 union repsFromTo {
@@ -155 +155 @@
         uint32_t __ndr_size;/* [value(ndr_size_drsuapi_MSPrefixMap_Ctr(r,ndr->flags))] */
         struct drsuapi_MSPrefixMap_Entry *entries;
-}/* [gensize,public] */;
+}/* [] */;
 
 enum prefixMapVersion
@@ -180 +180 @@
 union ldapControlDirSyncExtra {
         struct replUpToDateVectorBlob uptodateness_vector;/* [default] */
-}/* [gensize,nodiscriminant] */;
+}/* [] */;
 
 struct ldapControlDirSyncBlob {
@@ -228 +228 @@
         uint32_t __ndr_size;/* [value(ndr_size_supplementalCredentialsSubBlob(&sub,ndr->flags))] */
         uint32_t unknown2;/* [value(0)] */
-        struct supplementalCredentialsSubBlob sub;/* [subcontext_size(__ndr_size),subcontext(0)] */
+        struct supplementalCredentialsSubBlob sub;/* [subcontext)] */
         uint8_t unknown3;/* [value(0)] */
 }/* [public] */;
@@ -239 +239 @@
         uint16_t length;/* [value(2*strlen_m(string))] */
         uint16_t size;/* [value(2*strlen_m(string))] */
-        const char * string;/* [relative,subcontext_size(size),subcontext(0),flag(LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING)] */
+        const char * string;/* [)] */
 };
 
@@ -248 +248 @@
         uint32_t keytype;
         uint32_t value_len;/* [value((value?value->length:0))] */
-        DATA_BLOB *value;/* [relative,subcontext_size(value_len),subcontext(0),flag(LIBNDR_FLAG_REMAINING)] */
+        DATA_BLOB *value;/* [,flag(LIBNDR_FLAG_REMAINING)] */
 };
 
@@ -271 +271 @@
         uint32_t keytype;
         uint32_t value_len;/* [value((value?value->length:0))] */
-        DATA_BLOB *value;/* [relative,subcontext_size(value_len),subcontext(0),flag(LIBNDR_FLAG_REMAINING)] */
+        DATA_BLOB *value;/* [,subcontext(0),flag(LIBNDR_FLAG_REMAINING)] */
 };
 
@@ -351 +351 @@
         uint32_t count;
         struct AuthenticationInformation *array;
-}/* [gensize,nopush,public,nopull] */;
+}/* [] */;
 
 struct trustAuthInOutBlob {
@@ -357 +357 @@
         uint32_t current_offset;/* [value((count>0)?12:0)] */
         uint32_t previous_offset;/* [value((count>0)?12+ndr_size_AuthenticationInformationArray(&current,ndr->flags):0)] */
-        struct AuthenticationInformationArray current;/* [subcontext_size((previous_offset)-(current_offset)),subcontext(0)] */
+        struct AuthenticationInformationArray current;/* [subcontext)] */
         struct AuthenticationInformationArray previous;/* [subcontext(0),flag(LIBNDR_FLAG_REMAINING)] */
-}/* [gensize,public,nopush] */;
+}/* [] */;
 
 struct trustDomainPasswords {
         uint8_t confounder[512];
-        struct trustAuthInOutBlob outgoing;/* [subcontext_size(outgoing_size),subcontext(0)] */
+        struct trustAuthInOutBlob outgoing;/* [subcontext)] */
         struct trustAuthInOutBlob incoming;/* [subcontext_size(incoming_size),subcontext(0)] */
         uint32_t outgoing_size;/* [value(ndr_size_trustAuthInOutBlob(&outgoing,ndr->flags))] */
         uint32_t incoming_size;/* [value(ndr_size_trustAuthInOutBlob(&incoming,ndr->flags))] */
-}/* [public,nopull] */;
+}/* [] */;
 
 struct DsCompressedChunk {
@@ -376 +376 @@
 struct ExtendedErrorAString {
         uint16_t __size;
-        const char *string;/* [unique,charset(DOS),size_is(__size)] */
+        const char *string;/* [,size_is(__size)] */
 };
 
 struct ExtendedErrorUString {
         uint16_t __size;
-        const char *string;/* [unique,charset(UTF16),size_is(__size)] */
+        const char *string;/* [,size_is(__size)] */
 };
 
 struct ExtendedErrorBlob {
         uint16_t length;
-        uint8_t *data;/* [unique,size_is(length)] */
+        uint8_t *data;/* [] */
 };
 
@@ -508 +508 @@
         enum ForestTrustInfoRecordType type;
         union ForestTrustData data;/* [switch_is(type)] */
-}/* [gensize,public,flag(LIBNDR_FLAG_NOALIGN)] */;
+}/* [gensize,] */;
 
 struct ForestTrustInfoRecordArmor {