summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-01-05 15:37:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:19 -0500
commit4a49604e6c84597f97d98dd884f053edd6a84da3 (patch)
tree6037152b8f56f3699cf32b6e1f57c029896e1c73
parentd0da601ff78c1df7422e3a558db5a4c4862eb785 (diff)
downloadsamba-4a49604e6c84597f97d98dd884f053edd6a84da3.tar.gz
samba-4a49604e6c84597f97d98dd884f053edd6a84da3.tar.bz2
samba-4a49604e6c84597f97d98dd884f053edd6a84da3.zip
r4536: make use of the new enum and bitmap feature of pidl
metze (This used to be commit 7702d0f9775878c4d7535d9135f41d156146f8d1)
-rw-r--r--source4/librpc/idl/dssetup.idl32
1 files changed, 17 insertions, 15 deletions
diff --git a/source4/librpc/idl/dssetup.idl b/source4/librpc/idl/dssetup.idl
index c63a15c5cb..59d0c64eed 100644
--- a/source4/librpc/idl/dssetup.idl
+++ b/source4/librpc/idl/dssetup.idl
@@ -24,21 +24,23 @@
DS_ROLE_PRIMARY_DC = 5
} dssetup_DsRole;
- const uint32 DS_ROLE_PRIMARY_DS_RUNNING = 0x00000001;
- const uint32 DS_ROLE_PRIMARY_DS_MIXED_MODE = 0x00000002;
- const uint32 DS_ROLE_UPGRADE_IN_PROGRESS = 0x00000004;
- const uint32 DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT = 0x01000000;
+ typedef bitmap {
+ DS_ROLE_PRIMARY_DS_RUNNING = 0x00000001,
+ DS_ROLE_PRIMARY_DS_MIXED_MODE = 0x00000002,
+ DS_ROLE_UPGRADE_IN_PROGRESS = 0x00000004,
+ DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT = 0x01000000
+ } dssetup_DsRoleFlags;
typedef struct {
- uint16 role;
- uint32 flags;
- unistr *domain;
- unistr *dns_domain;
- unistr *forest;
- GUID domain_guid;
+ dssetup_DsRole role;
+ dssetup_DsRoleFlags flags;
+ unistr *domain;
+ unistr *dns_domain;
+ unistr *forest;
+ GUID domain_guid;
} dssetup_DsRolePrimaryDomInfoBasic;
- typedef enum {
+ typedef [v1_enum] enum {
DS_ROLE_NOT_UPGRADING = 0,
DS_ROLE_UPGRADING = 1
} dssetup_DsUpgrade;
@@ -50,8 +52,8 @@
} dssetup_DsPrevious;
typedef struct {
- uint32 upgrading;
- uint16 previous_role;
+ dssetup_DsUpgrade upgrading;
+ dssetup_DsPrevious previous_role;
} dssetup_DsRoleUpgradeStatus;
typedef enum {
@@ -61,7 +63,7 @@
} dssetup_DsRoleOp;
typedef struct {
- uint16 status;
+ dssetup_DsRoleOp status;
} dssetup_DsRoleOpStatus;
typedef enum {
@@ -77,7 +79,7 @@
} dssetup_DsRoleInfo;
WERROR dssetup_DsRoleGetPrimaryDomainInformation(
- [in] uint16 level,
+ [in] dssetup_DsRoleInfoLevel level,
[out,switch_is(level)] dssetup_DsRoleInfo *info
);