diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-02-06 23:02:27 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:17:47 -0500 |
commit | 654c36e1877c5e88b20b7901f813370164036322 (patch) | |
tree | 3e7ba4369c70d469930a93d90ff551a8ba63861c /source3 | |
parent | abbb882f748e35f0e58fec2e5abb39275fd0ffaf (diff) | |
download | samba-654c36e1877c5e88b20b7901f813370164036322.tar.gz samba-654c36e1877c5e88b20b7901f813370164036322.tar.bz2 samba-654c36e1877c5e88b20b7901f813370164036322.zip |
r21203: Regenerate C files after pidl updates.
(This used to be commit 1dc2ba09c7afc516d894fddfed613990ccf1f1ee)
Diffstat (limited to 'source3')
-rw-r--r-- | source3/librpc/gen_ndr/echo.h | 12 | ||||
-rw-r--r-- | source3/librpc/gen_ndr/lsa.h | 50 | ||||
-rw-r--r-- | source3/librpc/gen_ndr/netlogon.h | 42 | ||||
-rw-r--r-- | source3/librpc/gen_ndr/srvsvc.h | 25 | ||||
-rw-r--r-- | source3/librpc/gen_ndr/svcctl.h | 5 | ||||
-rw-r--r-- | source3/librpc/gen_ndr/winreg.h | 23 |
6 files changed, 157 insertions, 0 deletions
diff --git a/source3/librpc/gen_ndr/echo.h b/source3/librpc/gen_ndr/echo.h index bdbc040c11..d41853f8a1 100644 --- a/source3/librpc/gen_ndr/echo.h +++ b/source3/librpc/gen_ndr/echo.h @@ -44,15 +44,27 @@ union echo_Info { struct echo_info7 info7;/* [case(7)] */ }/* [switch_type(uint16)] */; +#ifndef USE_UINT_ENUMS enum echo_Enum1 { ECHO_ENUM1=1, ECHO_ENUM2=2 }; +#else +enum echo_Enum1 { __donnot_use_enum_echo_Enum1=0x7FFFFFFF}; +#define ECHO_ENUM1 ( 1 ) +#define ECHO_ENUM2 ( 2 ) +#endif +#ifndef USE_UINT_ENUMS enum echo_Enum1_32 { ECHO_ENUM1_32=1, ECHO_ENUM2_32=2 }; +#else +enum echo_Enum1_32 { __donnot_use_enum_echo_Enum1_32=0x7FFFFFFF}; +#define ECHO_ENUM1_32 ( 1 ) +#define ECHO_ENUM2_32 ( 2 ) +#endif struct echo_Enum2 { enum echo_Enum1 e1; diff --git a/source3/librpc/gen_ndr/lsa.h b/source3/librpc/gen_ndr/lsa.h index 0ffc8ed31b..5d86d81c34 100644 --- a/source3/librpc/gen_ndr/lsa.h +++ b/source3/librpc/gen_ndr/lsa.h @@ -128,6 +128,7 @@ struct lsa_DnsDomainInfo { struct dom_sid2 *sid;/* [unique] */ }; +#ifndef USE_UINT_ENUMS enum lsaPolicyInfo { LSA_POLICY_INFO_AUDIT_LOG=1, LSA_POLICY_INFO_AUDIT_EVENTS=2, @@ -142,6 +143,21 @@ enum lsaPolicyInfo { LSA_POLICY_INFO_AUDIT_FULL_QUERY=11, LSA_POLICY_INFO_DNS=12 }; +#else +enum lsaPolicyInfo { __donnot_use_enum_lsaPolicyInfo=0x7FFFFFFF}; +#define LSA_POLICY_INFO_AUDIT_LOG ( 1 ) +#define LSA_POLICY_INFO_AUDIT_EVENTS ( 2 ) +#define LSA_POLICY_INFO_DOMAIN ( 3 ) +#define LSA_POLICY_INFO_PD ( 4 ) +#define LSA_POLICY_INFO_ACCOUNT_DOMAIN ( 5 ) +#define LSA_POLICY_INFO_ROLE ( 6 ) +#define LSA_POLICY_INFO_REPLICA ( 7 ) +#define LSA_POLICY_INFO_QUOTA ( 8 ) +#define LSA_POLICY_INFO_DB ( 9 ) +#define LSA_POLICY_INFO_AUDIT_FULL_SET ( 10 ) +#define LSA_POLICY_INFO_AUDIT_FULL_QUERY ( 11 ) +#define LSA_POLICY_INFO_DNS ( 12 ) +#endif union lsa_PolicyInformation { struct lsa_AuditLogInfo audit_log;/* [case(LSA_POLICY_INFO_AUDIT_LOG)] */ @@ -172,6 +188,7 @@ struct lsa_DomainList { struct lsa_DomainInfo *domains;/* [unique,size_is(count)] */ }; +#ifndef USE_UINT_ENUMS enum lsa_SidType { SID_NAME_USE_NONE=0, SID_NAME_USER=1, @@ -184,6 +201,19 @@ enum lsa_SidType { SID_NAME_UNKNOWN=8, SID_NAME_COMPUTER=9 }; +#else +enum lsa_SidType { __donnot_use_enum_lsa_SidType=0x7FFFFFFF}; +#define SID_NAME_USE_NONE ( 0 ) +#define SID_NAME_USER ( 1 ) +#define SID_NAME_DOM_GRP ( 2 ) +#define SID_NAME_DOMAIN ( 3 ) +#define SID_NAME_ALIAS ( 4 ) +#define SID_NAME_WKN_GRP ( 5 ) +#define SID_NAME_DELETED ( 6 ) +#define SID_NAME_INVALID ( 7 ) +#define SID_NAME_UNKNOWN ( 8 ) +#define SID_NAME_COMPUTER ( 9 ) +#endif struct lsa_TranslatedSid { enum lsa_SidType sid_type; @@ -235,6 +265,7 @@ struct lsa_DATA_BUF2 { uint8_t *data;/* [unique,size_is(size)] */ }/* [flag(LIBNDR_PRINT_ARRAY_HEX)] */; +#ifndef USE_UINT_ENUMS enum lsa_TrustDomInfoEnum { LSA_TRUSTED_DOMAIN_INFO_NAME=1, LSA_TRUSTED_DOMAIN_INFO_CONTROLLERS_INFO=2, @@ -247,6 +278,19 @@ enum lsa_TrustDomInfoEnum { LSA_TRUSTED_DOMAIN_INFO_11=11, LSA_TRUSTED_DOMAIN_INFO_INFO_ALL=12 }; +#else +enum lsa_TrustDomInfoEnum { __donnot_use_enum_lsa_TrustDomInfoEnum=0x7FFFFFFF}; +#define LSA_TRUSTED_DOMAIN_INFO_NAME ( 1 ) +#define LSA_TRUSTED_DOMAIN_INFO_CONTROLLERS_INFO ( 2 ) +#define LSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET ( 3 ) +#define LSA_TRUSTED_DOMAIN_INFO_PASSWORD ( 4 ) +#define LSA_TRUSTED_DOMAIN_INFO_BASIC ( 5 ) +#define LSA_TRUSTED_DOMAIN_INFO_INFO_EX ( 6 ) +#define LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO ( 7 ) +#define LSA_TRUSTED_DOMAIN_INFO_FULL_INFO ( 8 ) +#define LSA_TRUSTED_DOMAIN_INFO_11 ( 11 ) +#define LSA_TRUSTED_DOMAIN_INFO_INFO_ALL ( 12 ) +#endif struct lsa_TrustDomainInfoName { struct lsa_StringLarge netbios_name; @@ -356,10 +400,16 @@ struct lsa_DomainInfoEfs { uint8_t *efs_blob;/* [unique,size_is(blob_size)] */ }; +#ifndef USE_UINT_ENUMS enum lsa_DomainInfoEnum { LSA_DOMAIN_INFO_POLICY_EFS=2, LSA_DOMAIN_INFO_POLICY_KERBEROS=3 }; +#else +enum lsa_DomainInfoEnum { __donnot_use_enum_lsa_DomainInfoEnum=0x7FFFFFFF}; +#define LSA_DOMAIN_INFO_POLICY_EFS ( 2 ) +#define LSA_DOMAIN_INFO_POLICY_KERBEROS ( 3 ) +#endif union lsa_DomainInformationPolicy { struct lsa_DomainInfoEfs efs_info;/* [case(LSA_DOMAIN_INFO_POLICY_EFS)] */ diff --git a/source3/librpc/gen_ndr/netlogon.h b/source3/librpc/gen_ndr/netlogon.h index 18c49501bf..76eac2a383 100644 --- a/source3/librpc/gen_ndr/netlogon.h +++ b/source3/librpc/gen_ndr/netlogon.h @@ -462,6 +462,7 @@ struct netr_DELTA_SECRET { uint32_t unknown8; }; +#ifndef USE_UINT_ENUMS enum netr_DeltaEnum { NETR_DELTA_DOMAIN=1, NETR_DELTA_GROUP=2, @@ -486,6 +487,31 @@ enum netr_DeltaEnum { NETR_DELTA_DELETE_USER2=21, NETR_DELTA_MODIFY_COUNT=22 }; +#else +enum netr_DeltaEnum { __donnot_use_enum_netr_DeltaEnum=0x7FFFFFFF}; +#define NETR_DELTA_DOMAIN ( 1 ) +#define NETR_DELTA_GROUP ( 2 ) +#define NETR_DELTA_DELETE_GROUP ( 3 ) +#define NETR_DELTA_RENAME_GROUP ( 4 ) +#define NETR_DELTA_USER ( 5 ) +#define NETR_DELTA_DELETE_USER ( 6 ) +#define NETR_DELTA_RENAME_USER ( 7 ) +#define NETR_DELTA_GROUP_MEMBER ( 8 ) +#define NETR_DELTA_ALIAS ( 9 ) +#define NETR_DELTA_DELETE_ALIAS ( 10 ) +#define NETR_DELTA_RENAME_ALIAS ( 11 ) +#define NETR_DELTA_ALIAS_MEMBER ( 12 ) +#define NETR_DELTA_POLICY ( 13 ) +#define NETR_DELTA_TRUSTED_DOMAIN ( 14 ) +#define NETR_DELTA_DELETE_TRUST ( 15 ) +#define NETR_DELTA_ACCOUNT ( 16 ) +#define NETR_DELTA_DELETE_ACCOUNT ( 17 ) +#define NETR_DELTA_SECRET ( 18 ) +#define NETR_DELTA_DELETE_SECRET ( 19 ) +#define NETR_DELTA_DELETE_GROUP2 ( 20 ) +#define NETR_DELTA_DELETE_USER2 ( 21 ) +#define NETR_DELTA_MODIFY_COUNT ( 22 ) +#endif union netr_DELTA_UNION { struct netr_DELTA_DOMAIN *domain;/* [unique,case(NETR_DELTA_DOMAIN)] */ @@ -564,12 +590,20 @@ union netr_CONTROL_QUERY_INFORMATION { struct netr_NETLOGON_INFO_3 *info3;/* [unique,case(3)] */ }; +#ifndef USE_UINT_ENUMS enum netr_LogonControlCode { NETLOGON_CONTROL_REDISCOVER=5, NETLOGON_CONTROL_TC_QUERY=6, NETLOGON_CONTROL_TRANSPORT_NOTIFY=7, NETLOGON_CONTROL_SET_DBFLAG=65534 }; +#else +enum netr_LogonControlCode { __donnot_use_enum_netr_LogonControlCode=0x7FFFFFFF}; +#define NETLOGON_CONTROL_REDISCOVER ( 5 ) +#define NETLOGON_CONTROL_TC_QUERY ( 6 ) +#define NETLOGON_CONTROL_TRANSPORT_NOTIFY ( 7 ) +#define NETLOGON_CONTROL_SET_DBFLAG ( 65534 ) +#endif union netr_CONTROL_DATA_INFORMATION { const char *domain;/* [unique,charset(UTF16),case(NETLOGON_CONTROL_REDISCOVER)] */ @@ -652,12 +686,20 @@ struct netr_CryptPassword { #define NETR_TRUST_FLAG_NATIVE ( 0x00000010 ) #define NETR_TRUST_FLAG_INBOUND ( 0x00000020 ) +#ifndef USE_UINT_ENUMS enum netr_TrustType { NETR_TRUST_TYPE_DOWNLEVEL=1, NETR_TRUST_TYPE_UPLEVEL=2, NETR_TRUST_TYPE_MIT=3, NETR_TRUST_TYPE_DCE=4 }; +#else +enum netr_TrustType { __donnot_use_enum_netr_TrustType=0x7FFFFFFF}; +#define NETR_TRUST_TYPE_DOWNLEVEL ( 1 ) +#define NETR_TRUST_TYPE_UPLEVEL ( 2 ) +#define NETR_TRUST_TYPE_MIT ( 3 ) +#define NETR_TRUST_TYPE_DCE ( 4 ) +#endif /* bitmap netr_TrustAttributes */ #define NETR_TRUST_ATTRIBUTE_NON_TRANSITIVE ( 0x00000001 ) diff --git a/source3/librpc/gen_ndr/srvsvc.h b/source3/librpc/gen_ndr/srvsvc.h index a1519c3ba8..7ec6575b95 100644 --- a/source3/librpc/gen_ndr/srvsvc.h +++ b/source3/librpc/gen_ndr/srvsvc.h @@ -207,6 +207,7 @@ union srvsvc_NetSessCtr { struct srvsvc_NetSessCtr502 *ctr502;/* [unique,case(502)] */ }; +#ifndef USE_UINT_ENUMS enum srvsvc_ShareType { STYPE_DISKTREE=0, STYPE_DISKTREE_TEMPORARY=STYPE_DISKTREE|STYPE_TEMPORARY, @@ -221,6 +222,21 @@ enum srvsvc_ShareType { STYPE_IPC_TEMPORARY=STYPE_IPC|STYPE_TEMPORARY, STYPE_IPC_HIDDEN=STYPE_IPC|STYPE_HIDDEN }; +#else +enum srvsvc_ShareType { __donnot_use_enum_srvsvc_ShareType=0x7FFFFFFF}; +#define STYPE_DISKTREE ( 0 ) +#define STYPE_DISKTREE_TEMPORARY ( STYPE_DISKTREE|STYPE_TEMPORARY ) +#define STYPE_DISKTREE_HIDDEN ( STYPE_DISKTREE|STYPE_HIDDEN ) +#define STYPE_PRINTQ ( 1 ) +#define STYPE_PRINTQ_TEMPORARY ( STYPE_PRINTQ|STYPE_TEMPORARY ) +#define STYPE_PRINTQ_HIDDEN ( STYPE_PRINTQ|STYPE_HIDDEN ) +#define STYPE_DEVICE ( 2 ) +#define STYPE_DEVICE_TEMPORARY ( STYPE_DEVICE|STYPE_TEMPORARY ) +#define STYPE_DEVICE_HIDDEN ( STYPE_DEVICE|STYPE_HIDDEN ) +#define STYPE_IPC ( 3 ) +#define STYPE_IPC_TEMPORARY ( STYPE_IPC|STYPE_TEMPORARY ) +#define STYPE_IPC_HIDDEN ( STYPE_IPC|STYPE_HIDDEN ) +#endif struct srvsvc_NetShareInfo0 { const char *name;/* [unique,charset(UTF16)] */ @@ -360,6 +376,7 @@ union srvsvc_NetShareCtr { struct srvsvc_NetShareCtr1501 *ctr1501;/* [unique,case(1501)] */ }; +#ifndef USE_UINT_ENUMS enum srvsvc_PlatformId { PLATFORM_ID_DOS=300, PLATFORM_ID_OS2=400, @@ -367,6 +384,14 @@ enum srvsvc_PlatformId { PLATFORM_ID_OSF=600, PLATFORM_ID_VMS=700 }; +#else +enum srvsvc_PlatformId { __donnot_use_enum_srvsvc_PlatformId=0x7FFFFFFF}; +#define PLATFORM_ID_DOS ( 300 ) +#define PLATFORM_ID_OS2 ( 400 ) +#define PLATFORM_ID_NT ( 500 ) +#define PLATFORM_ID_OSF ( 600 ) +#define PLATFORM_ID_VMS ( 700 ) +#endif struct srvsvc_NetSrvInfo100 { enum srvsvc_PlatformId platform_id; diff --git a/source3/librpc/gen_ndr/svcctl.h b/source3/librpc/gen_ndr/svcctl.h index 6bc81b93a7..21e182aa06 100644 --- a/source3/librpc/gen_ndr/svcctl.h +++ b/source3/librpc/gen_ndr/svcctl.h @@ -66,9 +66,14 @@ struct ENUM_SERVICE_STATUS { #define SV_TYPE_LOCAL_LIST_ONLY ( 0x40000000 ) #define SV_TYPE_DOMAIN_ENUM ( 0x80000000 ) +#ifndef USE_UINT_ENUMS enum SERVICE_CONTROL { FIXME=1 }; +#else +enum SERVICE_CONTROL { __donnot_use_enum_SERVICE_CONTROL=0x7FFFFFFF}; +#define FIXME ( 1 ) +#endif struct svcctl_CloseServiceHandle { diff --git a/source3/librpc/gen_ndr/winreg.h b/source3/librpc/gen_ndr/winreg.h index 967404dc1b..ac42edca17 100644 --- a/source3/librpc/gen_ndr/winreg.h +++ b/source3/librpc/gen_ndr/winreg.h @@ -8,6 +8,7 @@ /* bitmap winreg_AccessMask */ +#ifndef USE_UINT_ENUMS enum winreg_Type { REG_NONE=0, REG_SZ=1, @@ -22,6 +23,21 @@ enum winreg_Type { REG_RESOURCE_REQUIREMENTS_LIST=10, REG_QWORD=11 }; +#else +enum winreg_Type { __donnot_use_enum_winreg_Type=0x7FFFFFFF}; +#define REG_NONE ( 0 ) +#define REG_SZ ( 1 ) +#define REG_EXPAND_SZ ( 2 ) +#define REG_BINARY ( 3 ) +#define REG_DWORD ( 4 ) +#define REG_DWORD_BIG_ENDIAN ( 5 ) +#define REG_LINK ( 6 ) +#define REG_MULTI_SZ ( 7 ) +#define REG_RESOURCE_LIST ( 8 ) +#define REG_FULL_RESOURCE_DESCRIPTOR ( 9 ) +#define REG_RESOURCE_REQUIREMENTS_LIST ( 10 ) +#define REG_QWORD ( 11 ) +#endif struct winreg_String { uint16_t name_len;/* [value(strlen_m_term(name)*2)] */ @@ -41,11 +57,18 @@ struct winreg_SecBuf { uint8_t inherit; }; +#ifndef USE_UINT_ENUMS enum winreg_CreateAction { REG_ACTION_NONE=0, REG_CREATED_NEW_KEY=1, REG_OPENED_EXISTING_KEY=2 }; +#else +enum winreg_CreateAction { __donnot_use_enum_winreg_CreateAction=0x7FFFFFFF}; +#define REG_ACTION_NONE ( 0 ) +#define REG_CREATED_NEW_KEY ( 1 ) +#define REG_OPENED_EXISTING_KEY ( 2 ) +#endif struct winreg_StringBuf { uint16_t length;/* [value(strlen_m_term_null(name)*2)] */ |