diff options
| -rw-r--r-- | librpc/idl/misc.idl (renamed from source3/librpc/idl/misc.idl) | 0 | ||||
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source4/librpc/idl/misc.idl | 60 | ||||
| -rw-r--r-- | source4/librpc/idl/security.idl | 7 |
4 files changed, 8 insertions, 61 deletions
diff --git a/source3/librpc/idl/misc.idl b/librpc/idl/misc.idl index ff548fe804..ff548fe804 100644 --- a/source3/librpc/idl/misc.idl +++ b/librpc/idl/misc.idl diff --git a/source3/Makefile.in b/source3/Makefile.in index e99756752d..0329b9eb48 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1204,7 +1204,7 @@ samba3-idl:: librpc/idl/initshutdown.idl librpc/idl/srvsvc.idl librpc/idl/svcctl.idl \ librpc/idl/eventlog.idl librpc/idl/wkssvc.idl librpc/idl/netlogon.idl \ ../librpc/idl/notify.idl librpc/idl/epmapper.idl librpc/idl/messaging.idl \ - librpc/idl/xattr.idl librpc/idl/misc.idl librpc/idl/samr.idl \ + librpc/idl/xattr.idl ../librpc/idl/misc.idl librpc/idl/samr.idl \ librpc/idl/security.idl ../librpc/idl/dssetup.idl librpc/idl/krb5pac.idl \ librpc/idl/ntsvcs.idl librpc/idl/libnetapi.idl librpc/idl/drsuapi.idl \ librpc/idl/drsblobs.idl librpc/idl/nbt.idl diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl deleted file mode 100644 index 791b86466c..0000000000 --- a/source4/librpc/idl/misc.idl +++ /dev/null @@ -1,60 +0,0 @@ -/* - miscellaneous IDL structures -*/ - - -[ - pointer_default(unique) -] -interface misc -{ - typedef [public,noprint,gensize,noejs] struct { - uint32 time_low; - uint16 time_mid; - uint16 time_hi_and_version; - uint8 clock_seq[2]; - uint8 node[6]; - } GUID; - - typedef [public] struct { - GUID uuid; - uint32 if_version; - } ndr_syntax_id; - - typedef [public] struct { - uint32 handle_type; - GUID uuid; - } policy_handle; - - /* secure channel types */ - /* Only SEC_CHAN_WKSTA can forward requests to other domains. */ - - typedef [public] enum { - SEC_CHAN_NULL = 0, - SEC_CHAN_WKSTA = 2, - SEC_CHAN_DNS_DOMAIN = 3, - SEC_CHAN_DOMAIN = 4, - SEC_CHAN_BDC = 6 - } netr_SchannelType; - - /* SAM database types */ - typedef [public,v1_enum] enum { - SAM_DATABASE_DOMAIN = 0, /* Domain users and groups */ - SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */ - SAM_DATABASE_PRIVS = 2 /* Privileges */ - } netr_SamDatabaseID; - - typedef [public,v1_enum] enum { - SAMR_REJECT_OTHER = 0, - SAMR_REJECT_TOO_SHORT = 1, - SAMR_REJECT_IN_HISTORY = 2, - SAMR_REJECT_COMPLEXITY = 5 - } samr_RejectReason; - - /* id used to identify a endpoint, possibly in a cluster */ - typedef [public] struct { - hyper id; - uint32 id2; - uint32 node; - } server_id; -} diff --git a/source4/librpc/idl/security.idl b/source4/librpc/idl/security.idl index ac7641c0af..40aa698176 100644 --- a/source4/librpc/idl/security.idl +++ b/source4/librpc/idl/security.idl @@ -252,6 +252,13 @@ interface security uint32 sub_auths[num_auths]; } dom_sid; + /* id used to identify a endpoint, possibly in a cluster */ + typedef [public] struct { + hyper id; + uint32 id2; + uint32 node; + } server_id; + typedef [bitmap8bit] bitmap { SEC_ACE_FLAG_OBJECT_INHERIT = 0x01, SEC_ACE_FLAG_CONTAINER_INHERIT = 0x02, |