rerun 'make idl'

metze

diff --git a/source/librpc/gen_ndr/dfs.h b/source/librpc/gen_ndr/dfs.h
index 38e7f93950a7f75aca930a0279ecb63b2b4c7387..dc11e70b599c6453698ed8568935fb4b08a4cd95 100644 (file)
--- a/source/librpc/gen_ndr/dfs.h
+++ b/source/librpc/gen_ndr/dfs.h
@@ -37,8 +37,6 @@ struct dfs_Info1 {
 #define DFS_VOLUME_STATE_STANDALONE ( DFS_VOLUME_FLAVOR_STANDALONE )
 #define DFS_VOLUME_STATE_AD_BLOB ( DFS_VOLUME_FLAVOR_AD_BLOB )
 
-;
-
 struct dfs_Info2 {
        const char *path;/* [unique,charset(UTF16)] */
        const char *comment;/* [unique,charset(UTF16)] */
@@ -51,8 +49,6 @@ struct dfs_Info2 {
 #define DFS_STORAGE_STATE_ONLINE ( 2 )
 #define DFS_STORAGE_STATE_ACTIVE ( 4 )
 
-;
-
 struct dfs_StorageInfo {
        uint32_t state;
        const char *server;/* [unique,charset(UTF16)] */
@@ -84,8 +80,6 @@ struct dfs_Info4 {
 #define DFS_PROPERTY_FLAG_TARGET_FAILBACK ( 0x08 )
 #define DFS_PROPERTY_FLAG_CLUSTER_ENABLED ( 0x10 )
 
-;
-
 struct dfs_Info5 {
        const char *path;/* [unique,charset(UTF16)] */
        const char *comment;/* [unique,charset(UTF16)] */

diff --git a/source/librpc/gen_ndr/eventlog.h b/source/librpc/gen_ndr/eventlog.h
index e13fb50a5d67fd34933524e3ae62fd6208de037c..656dadcc6cab5e916fd3becd60dbeabb718d5255 100644 (file)
--- a/source/librpc/gen_ndr/eventlog.h
+++ b/source/librpc/gen_ndr/eventlog.h
@@ -13,8 +13,6 @@
 #define EVENTLOG_FORWARDS_READ ( 0x0004 )
 #define EVENTLOG_BACKWARDS_READ ( 0x0008 )
 
-;
-
 /* bitmap eventlogEventTypes */
 #define EVENTLOG_SUCCESS ( 0x0000 )
 #define EVENTLOG_ERROR_TYPE ( 0x0001 )
@@ -23,8 +21,6 @@
 #define EVENTLOG_AUDIT_SUCCESS ( 0x0008 )
 #define EVENTLOG_AUDIT_FAILURE ( 0x0010 )
 
-;
-
 struct eventlog_OpenUnknown0 {
        uint16_t unknown0;
        uint16_t unknown1;

diff --git a/source/librpc/gen_ndr/lsa.h b/source/librpc/gen_ndr/lsa.h
index cbaa9083e489c02c63f004a040026f1ee3414f78..2657557d9072370b8837922107515e72d3f88624 100644 (file)
--- a/source/librpc/gen_ndr/lsa.h
+++ b/source/librpc/gen_ndr/lsa.h
@@ -9,8 +9,6 @@
 #define LSA_ENUM_TRUST_DOMAIN_MULTIPLIER       ( 60 )
 #define LSA_REF_DOMAIN_LIST_MULTIPLIER ( 32 )
 #define LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER    ( 82 )
-;
-
 struct lsa_String {
        uint16_t length;/* [value(2*strlen_m(string))] */
        uint16_t size;/* [value(2*strlen_m(string))] */

diff --git a/source/librpc/gen_ndr/ndr_netlogon.c b/source/librpc/gen_ndr/ndr_netlogon.c
index 8a5ac4726f71aad4593d13b77ad7c76ac1865439..88b9fbd6e548045203b10d8a3877409dd64db75a 100644 (file)
--- a/source/librpc/gen_ndr/ndr_netlogon.c
+++ b/source/librpc/gen_ndr/ndr_netlogon.c
@@ -327,12 +327,39 @@ _PUBLIC_ void ndr_print_netr_AcctLockStr(struct ndr_print *ndr, const char *name
        ndr->depth--;
 }
 
+_PUBLIC_ enum ndr_err_code ndr_push_netr_LogonParameterControl(struct ndr_push *ndr, int ndr_flags, uint32_t r)
+{
+       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_netr_LogonParameterControl(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+{
+       uint32_t v;
+       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+       *r = v;
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_netr_LogonParameterControl(struct ndr_print *ndr, const char *name, uint32_t r)
+{
+       ndr_print_uint32(ndr, name, r);
+       ndr->depth++;
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "MSV1_0_CLEARTEXT_PASSWORD_ALLOWED", MSV1_0_CLEARTEXT_PASSWORD_ALLOWED, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "MSV1_0_UPDATE_LOGON_STATISTICS", MSV1_0_UPDATE_LOGON_STATISTICS, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "MSV1_0_RETURN_USER_PARAMETERS", MSV1_0_RETURN_USER_PARAMETERS, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT", MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "MSV1_0_RETURN_PROFILE_PATH", MSV1_0_RETURN_PROFILE_PATH, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT", MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT, r);
+       ndr->depth--;
+}
+
 static enum ndr_err_code ndr_push_netr_IdentityInfo(struct ndr_push *ndr, int ndr_flags, const struct netr_IdentityInfo *r)
 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));
                NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->domain_name));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->parameter_control));
+               NDR_CHECK(ndr_push_netr_LogonParameterControl(ndr, NDR_SCALARS, r->parameter_control));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->logon_id_low));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->logon_id_high));
                NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->account_name));
@@ -351,7 +378,7 @@ static enum ndr_err_code ndr_pull_netr_IdentityInfo(struct ndr_pull *ndr, int nd
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS, &r->domain_name));
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->parameter_control));
+               NDR_CHECK(ndr_pull_netr_LogonParameterControl(ndr, NDR_SCALARS, &r->parameter_control));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->logon_id_low));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->logon_id_high));
                NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS, &r->account_name));
@@ -370,7 +397,7 @@ _PUBLIC_ void ndr_print_netr_IdentityInfo(struct ndr_print *ndr, const char *nam
        ndr_print_struct(ndr, name, "netr_IdentityInfo");
        ndr->depth++;
        ndr_print_lsa_String(ndr, "domain_name", &r->domain_name);
-       ndr_print_uint32(ndr, "parameter_control", r->parameter_control);
+       ndr_print_netr_LogonParameterControl(ndr, "parameter_control", r->parameter_control);
        ndr_print_uint32(ndr, "logon_id_low", r->logon_id_low);
        ndr_print_uint32(ndr, "logon_id_high", r->logon_id_high);
        ndr_print_lsa_String(ndr, "account_name", &r->account_name);
@@ -814,39 +841,6 @@ _PUBLIC_ void ndr_print_netr_LogonLevel(struct ndr_print *ndr, const char *name,
        }
 }
 
-_PUBLIC_ enum ndr_err_code ndr_push_netr_GroupMembership(struct ndr_push *ndr, int ndr_flags, const struct netr_GroupMembership *r)
-{
-       if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->attributes));
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_pull_netr_GroupMembership(struct ndr_pull *ndr, int ndr_flags, struct netr_GroupMembership *r)
-{
-       if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->rid));
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->attributes));
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ void ndr_print_netr_GroupMembership(struct ndr_print *ndr, const char *name, const struct netr_GroupMembership *r)
-{
-       ndr_print_struct(ndr, name, "netr_GroupMembership");
-       ndr->depth++;
-       ndr_print_uint32(ndr, "rid", r->rid);
-       ndr_print_uint32(ndr, "attributes", r->attributes);
-       ndr->depth--;
-}
-
 _PUBLIC_ enum ndr_err_code ndr_push_netr_UserSessionKey(struct ndr_push *ndr, int ndr_flags, const struct netr_UserSessionKey *r)
 {
        {
@@ -1164,7 +1158,7 @@ static enum ndr_err_code ndr_push_netr_SidAttr(struct ndr_push *ndr, int ndr_fla
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->sid));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->attribute));
+               NDR_CHECK(ndr_push_samr_GroupAttrs(ndr, NDR_SCALARS, r->attributes));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->sid) {
@@ -1186,7 +1180,7 @@ static enum ndr_err_code ndr_pull_netr_SidAttr(struct ndr_pull *ndr, int ndr_fla
                } else {
                        r->sid = NULL;
                }
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->attribute));
+               NDR_CHECK(ndr_pull_samr_GroupAttrs(ndr, NDR_SCALARS, &r->attributes));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->sid) {
@@ -1209,7 +1203,7 @@ _PUBLIC_ void ndr_print_netr_SidAttr(struct ndr_print *ndr, const char *name, co
                ndr_print_dom_sid2(ndr, "sid", r->sid);
        }
        ndr->depth--;
-       ndr_print_uint32(ndr, "attribute", r->attribute);
+       ndr_print_samr_GroupAttrs(ndr, "attributes", r->attributes);
        ndr->depth--;
 }
 

diff --git a/source/librpc/gen_ndr/ndr_netlogon.h b/source/librpc/gen_ndr/ndr_netlogon.h
index c2fd0655d847e7bd5f65edcd5411cee61faf75b5..b1a5ce99736487a525a04bb81429cee741de0a51 100644 (file)
--- a/source/librpc/gen_ndr/ndr_netlogon.h
+++ b/source/librpc/gen_ndr/ndr_netlogon.h
@@ -109,6 +109,9 @@ extern const struct ndr_interface_table ndr_table_netlogon;
 void ndr_print_netr_UasInfo(struct ndr_print *ndr, const char *name, const struct netr_UasInfo *r);
 void ndr_print_netr_UasLogoffInfo(struct ndr_print *ndr, const char *name, const struct netr_UasLogoffInfo *r);
 void ndr_print_netr_AcctLockStr(struct ndr_print *ndr, const char *name, const struct netr_AcctLockStr *r);
+enum ndr_err_code ndr_push_netr_LogonParameterControl(struct ndr_push *ndr, int ndr_flags, uint32_t r);
+enum ndr_err_code ndr_pull_netr_LogonParameterControl(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
+void ndr_print_netr_LogonParameterControl(struct ndr_print *ndr, const char *name, uint32_t r);
 void ndr_print_netr_IdentityInfo(struct ndr_print *ndr, const char *name, const struct netr_IdentityInfo *r);
 void ndr_print_netr_PasswordInfo(struct ndr_print *ndr, const char *name, const struct netr_PasswordInfo *r);
 void ndr_print_netr_ChallengeResponse(struct ndr_print *ndr, const char *name, const struct netr_ChallengeResponse *r);
@@ -116,9 +119,6 @@ void ndr_print_netr_NetworkInfo(struct ndr_print *ndr, const char *name, const s
 enum ndr_err_code ndr_push_netr_LogonLevel(struct ndr_push *ndr, int ndr_flags, const union netr_LogonLevel *r);
 enum ndr_err_code ndr_pull_netr_LogonLevel(struct ndr_pull *ndr, int ndr_flags, union netr_LogonLevel *r);
 void ndr_print_netr_LogonLevel(struct ndr_print *ndr, const char *name, const union netr_LogonLevel *r);
-enum ndr_err_code ndr_push_netr_GroupMembership(struct ndr_push *ndr, int ndr_flags, const struct netr_GroupMembership *r);
-enum ndr_err_code ndr_pull_netr_GroupMembership(struct ndr_pull *ndr, int ndr_flags, struct netr_GroupMembership *r);
-void ndr_print_netr_GroupMembership(struct ndr_print *ndr, const char *name, const struct netr_GroupMembership *r);
 enum ndr_err_code ndr_push_netr_UserSessionKey(struct ndr_push *ndr, int ndr_flags, const struct netr_UserSessionKey *r);
 enum ndr_err_code ndr_pull_netr_UserSessionKey(struct ndr_pull *ndr, int ndr_flags, struct netr_UserSessionKey *r);
 void ndr_print_netr_UserSessionKey(struct ndr_print *ndr, const char *name, const struct netr_UserSessionKey *r);

diff --git a/source/librpc/gen_ndr/netlogon.h b/source/librpc/gen_ndr/netlogon.h
index 1dcc363742663144bcac83b1c162643cfaf57d9f..53aa350bed8f5f69b5200c2c3c855cba3a148dc2 100644 (file)
--- a/source/librpc/gen_ndr/netlogon.h
+++ b/source/librpc/gen_ndr/netlogon.h
@@ -8,15 +8,10 @@
 #ifndef _HEADER_netlogon
 #define _HEADER_netlogon
 
-#define MSV1_0_CLEARTEXT_PASSWORD_ALLOWED      ( 0x002 )
-#define MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT      ( 0x020 )
-#define MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT ( 0x800 )
 #define NETLOGON_NEG_ARCFOUR   ( 0x00000004 )
 #define NETLOGON_NEG_128BIT    ( 0x00004000 )
 #define NETLOGON_NEG_SCHANNEL  ( 0x40000000 )
 #define DS_GFTI_UPDATE_TDO     ( 0x1 )
-;
-
 struct netr_UasInfo {
        const char *account_name;/* [unique,charset(UTF16)] */
        uint32_t priv;
@@ -47,6 +42,14 @@ struct netr_AcctLockStr {
        uint16_t *bindata;/* [unique,length_is(length/2),size_is(size/2)] */
 };
 
+/* bitmap netr_LogonParameterControl */
+#define MSV1_0_CLEARTEXT_PASSWORD_ALLOWED ( 0x00000002 )
+#define MSV1_0_UPDATE_LOGON_STATISTICS ( 0x00000004 )
+#define MSV1_0_RETURN_USER_PARAMETERS ( 0x00000008 )
+#define MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT ( 0x00000020 )
+#define MSV1_0_RETURN_PROFILE_PATH ( 0x00000200 )
+#define MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT ( 0x00000800 )
+
 struct netr_IdentityInfo {
        struct lsa_String domain_name;
        uint32_t parameter_control;
@@ -80,11 +83,6 @@ union netr_LogonLevel {
        struct netr_NetworkInfo *network;/* [unique,case(2)] */
 }/* [public,switch_type(uint16)] */;
 
-struct netr_GroupMembership {
-       uint32_t rid;
-       uint32_t attributes;
-}/* [public] */;
-
 struct netr_UserSessionKey {
        uint8_t key[16];
 }/* [public,flag(LIBNDR_PRINT_ARRAY_HEX)] */;
@@ -106,8 +104,6 @@ struct netr_LMSessionKey {
 #define NETLOGON_PROFILE_PATH_RETURNED ( 0x00000400 )
 #define NETLOGON_GRACE_LOGON ( 0x01000000 )
 
-;
-
 struct netr_SamBaseInfo {
        NTTIME last_logon;
        NTTIME last_logoff;
@@ -142,7 +138,7 @@ struct netr_SamInfo2 {
 
 struct netr_SidAttr {
        struct dom_sid2 *sid;/* [unique] */
-       uint32_t attribute;
+       uint32_t attributes;
 };
 
 struct netr_SamInfo3 {
@@ -650,8 +646,6 @@ struct netr_Blob {
 #define DS_RETURN_DNS_NAME ( 0x40000000 )
 #define DS_RETURN_FLAT_NAME ( 0x80000000 )
 
-;
-
 enum netr_DsRGetDCNameInfo_AddressType
 #ifndef USE_UINT_ENUMS
  {
@@ -680,8 +674,6 @@ enum netr_DsRGetDCNameInfo_AddressType
 #define DS_DNS_DOMAIN ( 0x40000000 )
 #define DS_DNS_FOREST ( 0x80000000 )
 
-;
-
 struct netr_DsRGetDCNameInfo {
        const char *dc_unc;/* [unique,charset(UTF16)] */
        const char *dc_address;/* [unique,charset(UTF16)] */
@@ -763,8 +755,6 @@ struct netr_DsRAddress {
 #define NETR_TRUST_FLAG_NATIVE ( 0x00000010 )
 #define NETR_TRUST_FLAG_INBOUND ( 0x00000020 )
 
-;
-
 enum netr_TrustType
 #ifndef USE_UINT_ENUMS
  {
@@ -791,8 +781,6 @@ enum netr_TrustType
 #define NETR_TRUST_ATTRIBUTE_WITHIN_FOREST ( 0x00000020 )
 #define NETR_TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL ( 0x00000040 )
 
-;
-
 struct netr_DomainTrust {
        const char *netbios_name;/* [unique,charset(UTF16)] */
        const char *dns_name;/* [unique,charset(UTF16)] */

diff --git a/source/librpc/gen_ndr/samr.h b/source/librpc/gen_ndr/samr.h
index 16e633e47cbae7995acc8c3391c8d4dd5ca8ad4d..2ac845ee921b78545356cfccda0e66ac8f50e85b 100644 (file)
--- a/source/librpc/gen_ndr/samr.h
+++ b/source/librpc/gen_ndr/samr.h
@@ -9,8 +9,6 @@
 #define _HEADER_samr
 
 #define SAMR_ENUM_USERS_MULTIPLIER     ( 54 )
-;
-
 /* bitmap samr_AcctFlags */
 #define ACB_DISABLED ( 0x00000001 )
 #define ACB_HOMDIRREQ ( 0x00000002 )
@@ -32,8 +30,6 @@
 #define ACB_PW_EXPIRED ( 0x00020000 )
 #define ACB_NO_AUTH_DATA_REQD ( 0x00080000 )
 
-;
-
 /* bitmap samr_ConnectAccessMask */
 #define SAMR_ACCESS_CONNECT_TO_SERVER ( 0x00000001 )
 #define SAMR_ACCESS_SHUTDOWN_SERVER ( 0x00000002 )
@@ -42,8 +38,6 @@
 #define SAMR_ACCESS_ENUM_DOMAINS ( 0x00000010 )
 #define SAMR_ACCESS_OPEN_DOMAIN ( 0x00000020 )
 
-;
-
 /* bitmap samr_UserAccessMask */
 #define USER_ACCESS_GET_NAME_ETC ( 0x00000001 )
 #define USER_ACCESS_GET_LOCALE ( 0x00000002 )
@@ -57,8 +51,6 @@
 #define USER_ACCESS_GET_GROUP_MEMBERSHIP ( 0x00000200 )
 #define USER_ACCESS_CHANGE_GROUP_MEMBERSHIP ( 0x00000400 )
 
-;
-
 /* bitmap samr_DomainAccessMask */
 #define DOMAIN_ACCESS_LOOKUP_INFO_1 ( 0x00000001 )
 #define DOMAIN_ACCESS_SET_INFO_1 ( 0x00000002 )
@@ -72,8 +64,6 @@
 #define DOMAIN_ACCESS_OPEN_ACCOUNT ( 0x00000200 )
 #define DOMAIN_ACCESS_SET_INFO_3 ( 0x00000400 )
 
-;
-
 /* bitmap samr_GroupAccessMask */
 #define GROUP_ACCESS_LOOKUP_INFO ( 0x00000001 )
 #define GROUP_ACCESS_SET_INFO ( 0x00000002 )
@@ -81,8 +71,6 @@
 #define GROUP_ACCESS_REMOVE_MEMBER ( 0x00000008 )
 #define GROUP_ACCESS_GET_MEMBERS ( 0x00000010 )
 
-;
-
 /* bitmap samr_AliasAccessMask */
 #define ALIAS_ACCESS_ADD_MEMBER ( 0x00000001 )
 #define ALIAS_ACCESS_REMOVE_MEMBER ( 0x00000002 )
@@ -90,8 +78,6 @@
 #define ALIAS_ACCESS_LOOKUP_INFO ( 0x00000008 )
 #define ALIAS_ACCESS_SET_INFO ( 0x00000010 )
 
-;
-
 struct samr_SamEntry {
        uint32_t idx;
        struct lsa_String name;
@@ -127,8 +113,6 @@ enum samr_Role
 #define DOMAIN_PASSWORD_STORE_CLEARTEXT ( 0x00000010 )
 #define DOMAIN_REFUSE_PASSWORD_CHANGE ( 0x00000020 )
 
-;
-
 struct samr_DomInfo1 {
        uint16_t min_password_length;
        uint16_t password_history_length;
@@ -229,8 +213,6 @@ struct samr_Ids {
 #define SE_GROUP_RESOURCE ( 0x20000000 )
 #define SE_GROUP_LOGON_ID ( 0xC0000000 )
 
-;
-
 struct samr_GroupInfoAll {
        struct lsa_String name;
        uint32_t attributes;
@@ -454,8 +436,6 @@ struct samr_UserInfo20 {
 #define SAMR_FIELD_SEC_DESC ( 0x10000000 )
 #define SAMR_FIELD_OWF_PWD ( 0x20000000 )
 
-;
-
 struct samr_UserInfo21 {
        NTTIME last_logon;
        NTTIME last_logoff;
@@ -648,8 +628,6 @@ union samr_ConnectInfo {
 #define SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_LENGTH ( 0x00000010 )
 #define SAMR_VALIDATE_FIELD_PASSWORD_HISTORY ( 0x00000020 )
 
-;
-
 enum samr_ValidatePasswordLevel
 #ifndef USE_UINT_ENUMS
  {

diff --git a/source/librpc/gen_ndr/srvsvc.h b/source/librpc/gen_ndr/srvsvc.h
index bc167bb31c9108b84289a051cf23c21bd5ea0f0c..6e6c7829a0674492f349ea92b1d0550c1813c435 100644 (file)
--- a/source/librpc/gen_ndr/srvsvc.h
+++ b/source/librpc/gen_ndr/srvsvc.h
@@ -11,10 +11,6 @@
 #define STYPE_HIDDEN   ( 0x80000000 )
 #define SHARE_1005_CSC_POLICY_MASK     ( 0x00000030 )
 #define SHARE_1005_CSC_POLICY_SHIFT    ( 4 )
-;
-
-;
-
 struct srvsvc_NetCharDevInfo0 {
        const char *device;/* [unique,charset(UTF16)] */
 };
@@ -325,8 +321,6 @@ struct srvsvc_NetShareCtr1004 {
 #define SHARE_1005_IN_DFS ( 0x00000001 )
 #define SHARE_1005_DFS_ROOT ( 0x00000002 )
 
-;
-
 struct srvsvc_NetShareInfo1005 {
        uint32_t dfs_flags;
 };

diff --git a/source/librpc/gen_ndr/svcctl.h b/source/librpc/gen_ndr/svcctl.h
index f0e476c105d058a5a8f9f51503b7c23b555f549e..7314be0a33ee4a444e0fa7cafbefab44964ebca0 100644 (file)
--- a/source/librpc/gen_ndr/svcctl.h
+++ b/source/librpc/gen_ndr/svcctl.h
@@ -68,8 +68,6 @@ struct ENUM_SERVICE_STATUS {
 #define SV_TYPE_LOCAL_LIST_ONLY ( 0x40000000 )
 #define SV_TYPE_DOMAIN_ENUM ( 0x80000000 )
 
-;
-
 enum SERVICE_CONTROL
 #ifndef USE_UINT_ENUMS
  {

diff --git a/source/librpc/gen_ndr/winreg.h b/source/librpc/gen_ndr/winreg.h
index 8c498963b6df1b7dc8fee8050335a43937f2385e..5570b310cd04decd5b78d057e08fc8109095dcaf 100644 (file)
--- a/source/librpc/gen_ndr/winreg.h
+++ b/source/librpc/gen_ndr/winreg.h
@@ -8,8 +8,6 @@
 #ifndef _HEADER_winreg
 #define _HEADER_winreg
 
-;
-
 /* bitmap winreg_AccessMask */
 #define KEY_QUERY_VALUE ( 0x00001 )
 #define KEY_SET_VALUE ( 0x00002 )
@@ -20,8 +18,6 @@
 #define KEY_WOW64_64KEY ( 0x00100 )
 #define KEY_WOW64_32KEY ( 0x00200 )
 
-;
-
 enum winreg_Type
 #ifndef USE_UINT_ENUMS
  {

diff --git a/source/librpc/gen_ndr/wkssvc.h b/source/librpc/gen_ndr/wkssvc.h
index b4df7c2d8fc98517526a52ee4863d7c1a3f3e825..cdbf8516716e08bc82acfd1c22ea4f83da5a7129 100644 (file)
--- a/source/librpc/gen_ndr/wkssvc.h
+++ b/source/librpc/gen_ndr/wkssvc.h
@@ -415,8 +415,6 @@ struct wkssvc_NetrWorkstationStatistics {
 /* bitmap wkssvc_renameflags */
 #define WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE ( 0x00000002 )
 
-;
-
 enum wkssvc_NetValidateNameType
 #ifndef USE_UINT_ENUMS
  {
@@ -471,8 +469,6 @@ struct wkssvc_PasswordBuffer {
 #define WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE ( 0x00000002 )
 #define WKSSVC_JOIN_FLAGS_JOIN_TYPE ( 0x00000001 )
 
-;
-
 enum wkssvc_ComputerNameType
 #ifndef USE_UINT_ENUMS
  {