librpc/idl: Use [nopython] attr for types used in decode_PrimaryKerberos method
authorKamen Mazdrashki <kamenim@samba.org>
Tue, 6 Apr 2010 12:10:47 +0000 (15:10 +0300)
committerKamen Mazdrashki <kamenim@samba.org>
Fri, 9 Apr 2010 09:21:28 +0000 (12:21 +0300)
C code generation for python module generates invalid code
(i.e. can not be compiled).
Another reason to 'hide' those types from Python is
that those types are not used at the moment
(and most probably won't be used in the future)

librpc/gen_ndr/drsblobs.h
librpc/idl/drsblobs.idl

index 8a0dd1162b75604008c3a557d7b09e99cfa26748..3d5d0f27ef024367e3bc1d1c86cce6eb6a4f4429 100644 (file)
@@ -236,7 +236,7 @@ struct package_PrimaryKerberosString {
        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)] */
-};
+}/* [nopython] */;
 
 struct package_PrimaryKerberosKey3 {
        uint16_t reserved1;/* [value(0)] */
@@ -245,7 +245,7 @@ struct package_PrimaryKerberosKey3 {
        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)] */
-};
+}/* [nopython] */;
 
 struct package_PrimaryKerberosCtr3 {
        uint16_t num_keys;
@@ -258,7 +258,7 @@ struct package_PrimaryKerberosCtr3 {
        uint32_t padding3;/* [value(0)] */
        uint32_t padding4;/* [value(0)] */
        uint32_t padding5;/* [value(0)] */
-};
+}/* [nopython] */;
 
 struct package_PrimaryKerberosKey4 {
        uint16_t reserved1;/* [value(0)] */
@@ -268,7 +268,7 @@ struct package_PrimaryKerberosKey4 {
        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)] */
-};
+}/* [nopython] */;
 
 struct package_PrimaryKerberosCtr4 {
        uint16_t num_keys;
@@ -281,18 +281,18 @@ struct package_PrimaryKerberosCtr4 {
        struct package_PrimaryKerberosKey4 *service_keys;
        struct package_PrimaryKerberosKey4 *old_keys;
        struct package_PrimaryKerberosKey4 *older_keys;
-};
+}/* [nopython] */;
 
 union package_PrimaryKerberosCtr {
        struct package_PrimaryKerberosCtr3 ctr3;/* [case(3)] */
        struct package_PrimaryKerberosCtr4 ctr4;/* [case(4)] */
-}/* [nodiscriminant] */;
+}/* [nopython,nodiscriminant] */;
 
 struct package_PrimaryKerberosBlob {
        uint16_t version;
        uint16_t flags;/* [value(0)] */
        union package_PrimaryKerberosCtr ctr;/* [switch_is(version)] */
-}/* [public] */;
+}/* [nopython,public] */;
 
 struct package_PrimaryCLEARTEXTBlob {
        DATA_BLOB cleartext;/* [flag(LIBNDR_FLAG_REMAINING)] */
index f25e178a0cb6a66f96d2d0f7f6c665ba50c76527..89b5760823ddf35956548c8e066be3c39e8bb2b9 100644 (file)
@@ -334,13 +334,13 @@ interface drsblobs {
                [in] package_PackagesBlob blob
                );
 
-       typedef struct {
+       typedef [nopython] struct {
                [value(2*strlen_m(string))] uint16 length;
                [value(2*strlen_m(string))] uint16 size;
                [relative,subcontext(0),subcontext_size(size),flag(STR_NOTERM|NDR_REMAINING)] string *string;
        } package_PrimaryKerberosString;
 
-       typedef struct {
+       typedef [nopython] struct {
                [value(0)] uint16 reserved1;
                [value(0)] uint16 reserved2;
                [value(0)] uint32 reserved3;
@@ -349,7 +349,7 @@ interface drsblobs {
                [relative,subcontext(0),subcontext_size(value_len),flag(NDR_REMAINING)] DATA_BLOB *value;
        } package_PrimaryKerberosKey3;
 
-       typedef struct {
+       typedef [nopython] struct {
                uint16 num_keys;
                uint16 num_old_keys;
                package_PrimaryKerberosString salt;
@@ -362,7 +362,7 @@ interface drsblobs {
                [value(0)] uint32 padding5;
        } package_PrimaryKerberosCtr3;
 
-       typedef struct {
+       typedef [nopython] struct {
                [value(0)] uint16 reserved1;
                [value(0)] uint16 reserved2;
                [value(0)] uint32 reserved3;
@@ -372,7 +372,7 @@ interface drsblobs {
                [relative,subcontext(0),subcontext_size(value_len),flag(NDR_REMAINING)] DATA_BLOB *value;
        } package_PrimaryKerberosKey4;
 
-       typedef struct {
+       typedef [nopython] struct {
                uint16 num_keys;
                [value(0)] uint16 num_service_keys;
                uint16 num_old_keys;
@@ -385,12 +385,12 @@ interface drsblobs {
                package_PrimaryKerberosKey4 older_keys[num_older_keys];
        } package_PrimaryKerberosCtr4;
 
-       typedef [nodiscriminant] union {
+       typedef [nodiscriminant,nopython] union {
                [case(3)] package_PrimaryKerberosCtr3 ctr3;
                [case(4)] package_PrimaryKerberosCtr4 ctr4;
        } package_PrimaryKerberosCtr;
 
-       typedef [public] struct {
+       typedef [public,nopython] struct {
                uint16 version;
                [value(0)] uint16 flags;
                [switch_is(version)] package_PrimaryKerberosCtr ctr;