idl: merge from s4 lsa.idl to s3.

Guenther

diff --git a/source3/librpc/idl/lsa.idl b/source3/librpc/idl/lsa.idl
index 98c27cb717340333808c1b961cd3c24320d97bdc..a443448871afe58c9875db6e9871bef259763e5b 100644 (file)
--- a/source3/librpc/idl/lsa.idl
+++ b/source3/librpc/idl/lsa.idl
@@ -161,12 +161,11 @@ import "misc.idl", "security.idl";
 
        typedef struct {
                uint32 percent_full;
-               uint32 log_size;
-               NTTIME retention_time;
+               uint32 maximum_log_size;
+               hyper  retention_time;
                uint8  shutdown_in_progress;
-               NTTIME time_to_shutdown;
+               hyper  time_to_shutdown;
                uint32 next_audit_record;
-               uint32 unknown;
        } lsa_AuditLogInfo;
 
        typedef [v1_enum] enum {
@@ -204,9 +203,13 @@ import "misc.idl", "security.idl";
                lsa_String name;
        } lsa_PDAccountInfo;
 
+       typedef [v1_enum] enum {
+               LSA_ROLE_BACKUP=2,
+               LSA_ROLE_PRIMARY=3
+       } lsa_Role;
+
        typedef struct {
-               uint16 unknown; /* an midl padding bug? */
-               uint16 role;
+               lsa_Role role;
        } lsa_ServerRole;
 
        typedef struct {
@@ -233,7 +236,6 @@ import "misc.idl", "security.idl";
        } lsa_AuditFullSetInfo;
 
        typedef struct {
-               uint16 unknown; /* an midl padding bug? */
                uint8 shutdown_on_full;
                uint8 log_is_full;
        } lsa_AuditFullQueryInfo;
@@ -261,11 +263,12 @@ import "misc.idl", "security.idl";
                LSA_POLICY_INFO_ROLE=6,
                LSA_POLICY_INFO_REPLICA=7,
                LSA_POLICY_INFO_QUOTA=8,
-               LSA_POLICY_INFO_DB=9,
+               LSA_POLICY_INFO_MOD=9,
                LSA_POLICY_INFO_AUDIT_FULL_SET=10,
                LSA_POLICY_INFO_AUDIT_FULL_QUERY=11,
                LSA_POLICY_INFO_DNS=12,
-               LSA_POLICY_INFO_DNS_INT=13
+               LSA_POLICY_INFO_DNS_INT=13,
+               LSA_POLICY_INFO_L_ACCOUNT_DOMAIN=14
        } lsa_PolicyInfo;
 
        typedef [switch_type(uint16)] union {
@@ -277,11 +280,12 @@ import "misc.idl", "security.idl";
                [case(LSA_POLICY_INFO_ROLE)]             lsa_ServerRole         role;
                [case(LSA_POLICY_INFO_REPLICA)]          lsa_ReplicaSourceInfo  replica;
                [case(LSA_POLICY_INFO_QUOTA)]            lsa_DefaultQuotaInfo   quota;
-               [case(LSA_POLICY_INFO_DB)]               lsa_ModificationInfo   db;
+               [case(LSA_POLICY_INFO_MOD)]              lsa_ModificationInfo   mod;
                [case(LSA_POLICY_INFO_AUDIT_FULL_SET)]   lsa_AuditFullSetInfo   auditfullset;
                [case(LSA_POLICY_INFO_AUDIT_FULL_QUERY)] lsa_AuditFullQueryInfo auditfullquery;
                [case(LSA_POLICY_INFO_DNS)]              lsa_DnsDomainInfo      dns;
                [case(LSA_POLICY_INFO_DNS_INT)]          lsa_DnsDomainInfo      dns;
+               [case(LSA_POLICY_INFO_L_ACCOUNT_DOMAIN)] lsa_DomainInfo         l_account_domain;
        } lsa_PolicyInformation;
 
        NTSTATUS lsa_QueryInfoPolicy(
@@ -337,7 +341,7 @@ import "misc.idl", "security.idl";
        /* Function: 0x0c                                */
 
        [public] NTSTATUS lsa_CreateTrustedDomain(
-               [in]         policy_handle *handle,
+               [in]         policy_handle *policy_handle,
                [in]         lsa_DomainInfo *info,
                [in]         uint32 access_mask,
                [out]        policy_handle *trustdom_handle
@@ -365,7 +369,7 @@ import "misc.idl", "security.idl";
 
        /******************/
        /* Function: 0x0e */
-       typedef enum {
+       typedef [public] enum {
                SID_NAME_USE_NONE = 0,/* NOTUSED */
                SID_NAME_USER     = 1, /* user */
                SID_NAME_DOM_GRP  = 2, /* domain group */
@@ -515,23 +519,39 @@ import "misc.idl", "security.idl";
        /* Function:           0x16 */
        [todo] NTSTATUS lsa_SetQuotasForAccount();
        
+       typedef [bitmap32bit] bitmap {
+               LSA_POLICY_MODE_INTERACTIVE             = 0x00000001,
+               LSA_POLICY_MODE_NETWORK                 = 0x00000002,
+               LSA_POLICY_MODE_BATCH                   = 0x00000004,
+               LSA_POLICY_MODE_SERVICE                 = 0x00000010,
+               LSA_POLICY_MODE_PROXY                   = 0x00000020,
+               LSA_POLICY_MODE_DENY_INTERACTIVE        = 0x00000040,
+               LSA_POLICY_MODE_DENY_NETWORK            = 0x00000080,
+               LSA_POLICY_MODE_DENY_BATCH              = 0x00000100,
+               LSA_POLICY_MODE_DENY_SERVICE            = 0x00000200,
+               LSA_POLICY_MODE_REMOTE_INTERACTIVE      = 0x00000400,
+               LSA_POLICY_MODE_DENY_REMOTE_INTERACTIVE = 0x00000800,
+               LSA_POLICY_MODE_ALL                     = 0x00000FF7,
+               LSA_POLICY_MODE_ALL_NT4                 = 0x00000037
+       } lsa_SystemAccessModeFlags;
+
        /* Function:    0x17 */
        NTSTATUS lsa_GetSystemAccessAccount(
-               [in]    policy_handle *handle,
+               [in]      policy_handle *handle,
                [out,ref] uint32 *access_mask
                );
 
        /* Function:    0x18 */
        NTSTATUS lsa_SetSystemAccessAccount(
-               [in]    policy_handle *handle,
-               [in]    uint32 access_mask
+               [in] policy_handle *handle,
+               [in] uint32 access_mask
                );
 
        /* Function:        0x19 */
        NTSTATUS lsa_OpenTrustedDomain(
                [in]     policy_handle *handle,
                [in]     dom_sid2      *sid,
-               [in]         uint32         access_mask,
+               [in]     uint32         access_mask,
                [out]    policy_handle *trustdom_handle
                );
 
@@ -772,12 +792,12 @@ import "misc.idl", "security.idl";
                [out,ref] uint16 *returned_language_id
                );
 
-       /* Function:        0x22 */
+       /*******************/
+       /* Function:  0x22 */
        NTSTATUS lsa_DeleteObject (
                [in,out]     policy_handle *handle
                );
 
-
        /*******************/
        /* Function:      0x23 */
        NTSTATUS lsa_EnumAccountsWithUserRight (
@@ -832,7 +852,7 @@ import "misc.idl", "security.idl";
        NTSTATUS lsa_SetTrustedDomainInfo(
                [in]               policy_handle         *handle,
                [in]               dom_sid2              *dom_sid,
-               [in]                   lsa_TrustDomInfoEnum  level,
+               [in]               lsa_TrustDomInfoEnum  level,
                [in,switch_is(level)] lsa_TrustedDomainInfo *info
         );
 
@@ -895,7 +915,7 @@ import "misc.idl", "security.idl";
        NTSTATUS lsa_SetTrustedDomainInfoByName(
                [in]                   policy_handle         *handle,
                [in]                   lsa_String             trusted_domain,
-               [in]                   lsa_TrustDomInfoEnum   level, 
+               [in]                   lsa_TrustDomInfoEnum   level,
                [in,unique,switch_is(level)] lsa_TrustedDomainInfo *info
                );
 

diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index 8745385a101bdda547133b984245e3bf89ae2d1d..4a7a42b4dc956802c93dac29972613adfb88e6bc 100644 (file)
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -288,7 +288,7 @@ import "misc.idl", "security.idl";
                [case(LSA_POLICY_INFO_L_ACCOUNT_DOMAIN)] lsa_DomainInfo         l_account_domain;
        } lsa_PolicyInformation;
 
-       NTSTATUS lsa_QueryInfoPolicy (
+       NTSTATUS lsa_QueryInfoPolicy(
                [in]                            policy_handle *handle,
                [in]                            lsa_PolicyInfo level,
                [out,unique,switch_is(level)]   lsa_PolicyInformation *info
@@ -718,14 +718,14 @@ import "misc.idl", "security.idl";
        /* Function:       0x1a */
        NTSTATUS lsa_QueryTrustedDomainInfo(
                [in]     policy_handle                   *trustdom_handle,
-               [in]     lsa_TrustDomInfoEnum             level, 
+               [in]     lsa_TrustDomInfoEnum             level,
                [out,switch_is(level),unique] lsa_TrustedDomainInfo *info
                );
 
        /* Function:     0x1b */
        NTSTATUS lsa_SetInformationTrustedDomain(
                [in]                  policy_handle         *trustdom_handle,
-               [in]                  lsa_TrustDomInfoEnum   level, 
+               [in]                  lsa_TrustDomInfoEnum   level,
                [in,switch_is(level)] lsa_TrustedDomainInfo *info
                );
 
@@ -792,8 +792,6 @@ import "misc.idl", "security.idl";
                [in,out]     policy_handle *handle
                );
 
-
-       
        /*******************/
        /* Function:      0x23 */
        NTSTATUS lsa_EnumAccountsWithUserRight (
@@ -840,7 +838,7 @@ import "misc.idl", "security.idl";
        NTSTATUS lsa_QueryTrustedDomainInfoBySid(
                [in]               policy_handle         *handle,
                [in]               dom_sid2              *dom_sid,
-               [in]                   lsa_TrustDomInfoEnum  level, 
+               [in]               lsa_TrustDomInfoEnum  level,
                [out,switch_is(level),unique] lsa_TrustedDomainInfo *info
         );
 
@@ -848,9 +846,10 @@ import "misc.idl", "security.idl";
        NTSTATUS lsa_SetTrustedDomainInfo(
                [in]               policy_handle         *handle,
                [in]               dom_sid2              *dom_sid,
-               [in]                   lsa_TrustDomInfoEnum  level, 
+               [in]               lsa_TrustDomInfoEnum  level,
                [in,switch_is(level)] lsa_TrustedDomainInfo *info
         );
+
        /* Function:      0x29 */
        NTSTATUS lsa_DeleteTrustedDomain(
                [in]               policy_handle         *handle,
@@ -888,8 +887,8 @@ import "misc.idl", "security.idl";
        /* Function:          0x2e */
 
        NTSTATUS lsa_QueryInfoPolicy2(
-               [in]                 policy_handle *handle,
-               [in]                     lsa_PolicyInfo level,
+               [in]                         policy_handle *handle,
+               [in]                         lsa_PolicyInfo level,
                [out,unique,switch_is(level)]   lsa_PolicyInformation *info
                );
 
@@ -903,9 +902,9 @@ import "misc.idl", "security.idl";
        /**********************/
        /* Function 0x30 */
        NTSTATUS lsa_QueryTrustedDomainInfoByName(
-               [in]                   policy_handle         *handle,
+               [in]                   policy_handle          *handle,
                [in]                   lsa_String             trusted_domain,
-               [in]                   lsa_TrustDomInfoEnum   level, 
+               [in]                   lsa_TrustDomInfoEnum   level,
                [out,unique,switch_is(level)] lsa_TrustedDomainInfo *info
                );
 
@@ -914,7 +913,7 @@ import "misc.idl", "security.idl";
        NTSTATUS lsa_SetTrustedDomainInfoByName(
                [in]                   policy_handle         *handle,
                [in]                   lsa_String             trusted_domain,
-               [in]                   lsa_TrustDomInfoEnum   level, 
+               [in]                   lsa_TrustDomInfoEnum   level,
                [in,unique,switch_is(level)] lsa_TrustedDomainInfo *info
                );
 
@@ -980,7 +979,7 @@ import "misc.idl", "security.idl";
 
        NTSTATUS lsa_QueryDomainInformationPolicy(
                [in]            policy_handle *handle,
-               [in]                    uint16 level,
+               [in]            uint16 level,
                [out,unique,switch_is(level)]   lsa_DomainInformationPolicy *info
                );