s3-samr-idl: add Alias Object specific access rights.
[ira/wip.git] / source3 / librpc / idl / samr.idl
index afeca3edd61f9ffb785042c9520b6b4de98b003a..9f7265762063103ae2e7ddea6eecea68e0c2d00d 100644 (file)
@@ -3,6 +3,7 @@
 /*
   samr interface definition
 */
+import "misc.idl", "lsa.idl", "security.idl";
 
 /*
   Thanks to Todd Sabin for some information from his samr.idl in acltools
@@ -11,9 +12,7 @@
 [ uuid("12345778-1234-abcd-ef00-0123456789ac"),
   version(1.0),
   endpoint("ncacn_np:[\\pipe\\samr]","ncacn_ip_tcp:", "ncalrpc:"),
-  pointer_default(unique),
-  pointer_default_top(unique),
-  depends(misc,lsa,security)
+  pointer_default(unique)
 ] interface samr
 {
        typedef bitmap security_secinfo security_secinfo;
                ACB_NO_AUTH_DATA_REQD           = 0x00080000   /* 1 = No authorization data required */
        } samr_AcctFlags;
 
+       /* SAM server specific access rights */
+
+       typedef [bitmap32bit] bitmap {
+               SAMR_ACCESS_CONNECT_TO_SERVER   = 0x00000001,
+               SAMR_ACCESS_SHUTDOWN_SERVER     = 0x00000002,
+               SAMR_ACCESS_INITIALIZE_SERVER   = 0x00000004,
+               SAMR_ACCESS_CREATE_DOMAIN       = 0x00000008,
+               SAMR_ACCESS_ENUM_DOMAINS        = 0x00000010,
+               SAMR_ACCESS_OPEN_DOMAIN         = 0x00000020
+       } samr_ConnectAccessMask;
+
+       const int SAMR_ACCESS_ALL_ACCESS = 0x0000003F;
+
+       const int GENERIC_RIGHTS_SAM_ALL_ACCESS =
+               (STANDARD_RIGHTS_REQUIRED_ACCESS        |
+                SAMR_ACCESS_ALL_ACCESS);
+
+       const int GENERIC_RIGHTS_SAM_READ =
+               (STANDARD_RIGHTS_READ_ACCESS            |
+                SAMR_ACCESS_ENUM_DOMAINS);
+
+       const int GENERIC_RIGHTS_SAM_WRITE =
+               (STANDARD_RIGHTS_WRITE_ACCESS           |
+                SAMR_ACCESS_CREATE_DOMAIN              |
+                SAMR_ACCESS_INITIALIZE_SERVER          |
+                SAMR_ACCESS_SHUTDOWN_SERVER);
+
+       const int GENERIC_RIGHTS_SAM_EXECUTE =
+               (STANDARD_RIGHTS_EXECUTE_ACCESS         |
+                SAMR_ACCESS_OPEN_DOMAIN                |
+                SAMR_ACCESS_CONNECT_TO_SERVER);
+
+       /* User Object specific access rights */
+
+       typedef [bitmap32bit] bitmap {
+               SAMR_USER_ACCESS_GET_NAME_ETC             = 0x00000001,
+               SAMR_USER_ACCESS_GET_LOCALE               = 0x00000002,
+               SAMR_USER_ACCESS_SET_LOC_COM              = 0x00000004,
+               SAMR_USER_ACCESS_GET_LOGONINFO            = 0x00000008,
+               SAMR_USER_ACCESS_GET_ATTRIBUTES           = 0x00000010,
+               SAMR_USER_ACCESS_SET_ATTRIBUTES           = 0x00000020,
+               SAMR_USER_ACCESS_CHANGE_PASSWORD          = 0x00000040,
+               SAMR_USER_ACCESS_SET_PASSWORD             = 0x00000080,
+               SAMR_USER_ACCESS_GET_GROUPS               = 0x00000100,
+               SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP     = 0x00000200,
+               SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP  = 0x00000400
+       } samr_UserAccessMask;
+
+       const int SAMR_USER_ACCESS_ALL_ACCESS = 0x000007FF;
+
+       const int GENERIC_RIGHTS_USER_ALL_ACCESS =
+               (STANDARD_RIGHTS_REQUIRED_ACCESS        |
+                SAMR_USER_ACCESS_ALL_ACCESS);  /* 0x000f07ff */
+
+       const int GENERIC_RIGHTS_USER_READ =
+               (STANDARD_RIGHTS_READ_ACCESS            |
+                SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP  |
+                SAMR_USER_ACCESS_GET_GROUPS            |
+                SAMR_USER_ACCESS_GET_ATTRIBUTES        |
+                SAMR_USER_ACCESS_GET_LOGONINFO         |
+                SAMR_USER_ACCESS_GET_LOCALE);  /* 0x0002031a */
+
+       const int GENERIC_RIGHTS_USER_WRITE =
+               (STANDARD_RIGHTS_WRITE_ACCESS           |
+                SAMR_USER_ACCESS_CHANGE_PASSWORD       |
+                SAMR_USER_ACCESS_SET_LOC_COM           |
+                SAMR_USER_ACCESS_SET_ATTRIBUTES        |
+                SAMR_USER_ACCESS_SET_PASSWORD          |
+                SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP);     /* 0x000204e4 */
+
+       const int GENERIC_RIGHTS_USER_EXECUTE =
+               (STANDARD_RIGHTS_EXECUTE_ACCESS         |
+                SAMR_USER_ACCESS_CHANGE_PASSWORD       |
+                SAMR_USER_ACCESS_GET_NAME_ETC);        /* 0x00020041 */
+
+       /* Domain Object specific access rights */
+
+       typedef [bitmap32bit] bitmap {
+               SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1  = 0x00000001,
+               SAMR_DOMAIN_ACCESS_SET_INFO_1     = 0x00000002,
+               SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2  = 0x00000004,
+               SAMR_DOMAIN_ACCESS_SET_INFO_2     = 0x00000008,
+               SAMR_DOMAIN_ACCESS_CREATE_USER    = 0x00000010,
+               SAMR_DOMAIN_ACCESS_CREATE_GROUP   = 0x00000020,
+               SAMR_DOMAIN_ACCESS_CREATE_ALIAS   = 0x00000040,
+               SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS   = 0x00000080,
+               SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS  = 0x00000100,
+               SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT   = 0x00000200,
+               SAMR_DOMAIN_ACCESS_SET_INFO_3     = 0x00000400
+       } samr_DomainAccessMask;
+
+       const int SAMR_DOMAIN_ACCESS_ALL_ACCESS = 0x000007FF;
+
+       const int GENERIC_RIGHTS_DOMAIN_ALL_ACCESS =
+               (STANDARD_RIGHTS_REQUIRED_ACCESS        |
+                SAMR_DOMAIN_ACCESS_ALL_ACCESS);
+
+       const int GENERIC_RIGHTS_DOMAIN_READ =
+               (STANDARD_RIGHTS_READ_ACCESS            |
+                SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS        |
+                SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2);
+
+       const int GENERIC_RIGHTS_DOMAIN_WRITE =
+               (STANDARD_RIGHTS_WRITE_ACCESS           |
+                SAMR_DOMAIN_ACCESS_SET_INFO_3          |
+                SAMR_DOMAIN_ACCESS_CREATE_ALIAS        |
+                SAMR_DOMAIN_ACCESS_CREATE_GROUP        |
+                SAMR_DOMAIN_ACCESS_CREATE_USER         |
+                SAMR_DOMAIN_ACCESS_SET_INFO_2          |
+                SAMR_DOMAIN_ACCESS_SET_INFO_1);
+
+       const int GENERIC_RIGHTS_DOMAIN_EXECUTE =
+               (STANDARD_RIGHTS_EXECUTE_ACCESS         |
+                SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT        |
+                SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS       |
+                SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1);
+
+       /* Group Object specific access rights */
+
+       typedef [bitmap32bit] bitmap {
+               SAMR_GROUP_ACCESS_LOOKUP_INFO     = 0x00000001,
+               SAMR_GROUP_ACCESS_SET_INFO        = 0x00000002,
+               SAMR_GROUP_ACCESS_ADD_MEMBER      = 0x00000004,
+               SAMR_GROUP_ACCESS_REMOVE_MEMBER   = 0x00000008,
+               SAMR_GROUP_ACCESS_GET_MEMBERS     = 0x00000010
+       } samr_GroupAccessMask;
+
+       const int SAMR_GROUP_ACCESS_ALL_ACCESS = 0x0000001F;
+
+       const int GENERIC_RIGHTS_GROUP_ALL_ACCESS =
+               (STANDARD_RIGHTS_REQUIRED_ACCESS        |
+                SAMR_GROUP_ACCESS_ALL_ACCESS); /* 0x000f001f */
+
+       const int GENERIC_RIGHTS_GROUP_READ =
+               (STANDARD_RIGHTS_READ_ACCESS            |
+                SAMR_GROUP_ACCESS_GET_MEMBERS);        /* 0x00020010 */
+
+       const int GENERIC_RIGHTS_GROUP_WRITE =
+               (STANDARD_RIGHTS_WRITE_ACCESS           |
+                SAMR_GROUP_ACCESS_REMOVE_MEMBER        |
+                SAMR_GROUP_ACCESS_ADD_MEMBER           |
+                SAMR_GROUP_ACCESS_SET_INFO);   /* 0x0002000e */
+
+       const int GENERIC_RIGHTS_GROUP_EXECUTE =
+               (STANDARD_RIGHTS_EXECUTE_ACCESS         |
+                SAMR_GROUP_ACCESS_LOOKUP_INFO);        /* 0x00020001 */
+
+       /* Alias Object specific access rights */
+
+       typedef [bitmap32bit] bitmap {
+               SAMR_ALIAS_ACCESS_ADD_MEMBER      = 0x00000001,
+               SAMR_ALIAS_ACCESS_REMOVE_MEMBER   = 0x00000002,
+               SAMR_ALIAS_ACCESS_GET_MEMBERS     = 0x00000004,
+               SAMR_ALIAS_ACCESS_LOOKUP_INFO     = 0x00000008,
+               SAMR_ALIAS_ACCESS_SET_INFO        = 0x00000010
+       } samr_AliasAccessMask;
+
+       const int SAMR_ALIAS_ACCESS_ALL_ACCESS = 0x0000001F;
+
+       const int GENERIC_RIGHTS_ALIAS_ALL_ACCESS =
+               (STANDARD_RIGHTS_REQUIRED_ACCESS        |
+                SAMR_ALIAS_ACCESS_ALL_ACCESS); /* 0x000f001f */
+
+       const int GENERIC_RIGHTS_ALIAS_READ =
+               (STANDARD_RIGHTS_READ_ACCESS            |
+                SAMR_ALIAS_ACCESS_GET_MEMBERS);        /* 0x00020004 */
+
+       const int GENERIC_RIGHTS_ALIAS_WRITE =
+               (STANDARD_RIGHTS_WRITE_ACCESS           |
+                SAMR_ALIAS_ACCESS_REMOVE_MEMBER        |
+                SAMR_ALIAS_ACCESS_ADD_MEMBER           |
+                SAMR_ALIAS_ACCESS_SET_INFO);   /* 0x00020013 */
+
+       const int GENERIC_RIGHTS_ALIAS_EXECUTE =
+               (STANDARD_RIGHTS_EXECUTE_ACCESS         |
+                SAMR_ALIAS_ACCESS_LOOKUP_INFO);        /* 0x00020008 */
+
        /******************/
        /* Function: 0x00 */
        NTSTATUS samr_Connect (
                /* notice the lack of [string] */
-               [in]       uint16 *system_name,
-               [in]       uint32 access_mask,
+               [in,unique] uint16 *system_name,
+               [in]       samr_ConnectAccessMask access_mask,
                [out,ref]  policy_handle *connect_handle
                );
 
 
        /******************/
        /* Function: 0x01 */
-       NTSTATUS samr_Close (
+       [public] NTSTATUS samr_Close (
                [in,out,ref]  policy_handle *handle
                );
 
        NTSTATUS samr_QuerySecurity (
                [in,ref]          policy_handle *handle,
                [in]              security_secinfo sec_info,
-               [out]             sec_desc_buf *sdbuf
+               [out,ref]         sec_desc_buf **sdbuf
                );
 
        /******************/
        /******************/
        /* Function: 0x05 */
        NTSTATUS samr_LookupDomain (
-               [in,ref]  policy_handle *connect_handle,                
+               [in,ref]  policy_handle *connect_handle,
                [in,ref]  lsa_String *domain_name,
-               [out]     dom_sid2 *sid
+               [out,ref] dom_sid2 **sid
                );
 
 
        } samr_SamArray;
 
        NTSTATUS samr_EnumDomains (
-               [in,ref]      policy_handle *connect_handle,
+               [in]          policy_handle *connect_handle,
                [in,out,ref]  uint32 *resume_handle,
+               [out,ref]     samr_SamArray **sam,
                [in]          uint32 buf_size,
-               [out]         samr_SamArray *sam,
-               [out]         uint32 num_entries
+               [out,ref]     uint32 *num_entries
                );
 
 
        /************************/
        /* Function    0x07     */
-       NTSTATUS samr_OpenDomain(
+       [public] NTSTATUS samr_OpenDomain(
                [in,ref]      policy_handle *connect_handle,
-               [in]          uint32 access_mask,
+               [in]          samr_DomainAccessMask access_mask,
                [in,ref]      dom_sid2 *sid,
                [out,ref]     policy_handle *domain_handle
                );
        /* Function    0x08     */
        /* server roles */
        typedef [v1_enum] enum {
-               ROLE_STANDALONE    = 0,
-               ROLE_DOMAIN_MEMBER = 1,
-               ROLE_DOMAIN_BDC    = 2,
-               ROLE_DOMAIN_PDC    = 3
+               SAMR_ROLE_STANDALONE    = 0,
+               SAMR_ROLE_DOMAIN_MEMBER = 1,
+               SAMR_ROLE_DOMAIN_BDC    = 2,
+               SAMR_ROLE_DOMAIN_PDC    = 3
        } samr_Role;
 
        /* password properties flags */
 
        typedef struct {
                NTTIME force_logoff_time;
-               lsa_String comment;
+               lsa_String oem_information; /* comment */
                lsa_String domain_name;
                lsa_String primary; /* PDC name if this is a BDC */
                udlong sequence_num;
                uint32 num_users;
                uint32 num_groups;
                uint32 num_aliases;
-       } samr_DomInfo2;
+       } samr_DomGeneralInformation;
 
        typedef struct {
                NTTIME force_logoff_time;
        } samr_DomInfo3;
 
        typedef struct {
-               lsa_String comment;
-       } samr_DomInfo4;
+               lsa_String oem_information; /* comment */
+       } samr_DomOEMInformation;
 
        typedef struct {
                lsa_String domain_name;
        } samr_DomInfo9;
 
        typedef struct {
-               samr_DomInfo2 info2;
+               samr_DomGeneralInformation general;
                hyper lockout_duration;
                hyper lockout_window;
                uint16 lockout_threshold;
-       } samr_DomInfo11;
+       } samr_DomGeneralInformation2;
 
        typedef struct {
                hyper lockout_duration;
 
        typedef [switch_type(uint16)] union {
                [case(1)] samr_DomInfo1 info1;
-               [case(2)] samr_DomInfo2 info2;
+               [case(2)] samr_DomGeneralInformation general;
                [case(3)] samr_DomInfo3 info3;
-               [case(4)] samr_DomInfo4 info4;
+               [case(4)] samr_DomOEMInformation oem;
                [case(5)] samr_DomInfo5 info5;
                [case(6)] samr_DomInfo6 info6;
                [case(7)] samr_DomInfo7 info7;
                [case(8)] samr_DomInfo8 info8;
                [case(9)] samr_DomInfo9 info9;
-               [case(11)] samr_DomInfo11 info11;
+               [case(11)] samr_DomGeneralInformation2 general2;
                [case(12)] samr_DomInfo12 info12;
                [case(13)] samr_DomInfo13 info13;
        } samr_DomainInfo;
        NTSTATUS samr_QueryDomainInfo(
                [in,ref]      policy_handle *domain_handle,
                [in]          uint16 level,
-               [out,switch_is(level)] samr_DomainInfo *info
+               [out,ref,switch_is(level)] samr_DomainInfo **info
                );
 
        /************************/
        NTSTATUS samr_CreateDomainGroup(
                [in,ref]      policy_handle *domain_handle,
                [in,ref]      lsa_String *name,
-               [in]          uint32 access_mask,
+               [in]          samr_GroupAccessMask access_mask,
                [out,ref]     policy_handle *group_handle,
                [out,ref]     uint32 *rid
                );
 
        /************************/
        /* Function    0x0b     */
+
+       const int MAX_SAM_ENTRIES_W2K = 0x400; /* 1024 */
+       const int MAX_SAM_ENTRIES_W95 = 50;
+
        NTSTATUS samr_EnumDomainGroups(
-               [in,ref]      policy_handle *domain_handle,
+               [in]          policy_handle *domain_handle,
                [in,out,ref]  uint32 *resume_handle,
+               [out,ref]     samr_SamArray **sam,
                [in]          uint32 max_size,
-               [out]         samr_SamArray *sam,
-               [out]         uint32 num_entries
+               [out,ref]     uint32 *num_entries
                );
 
        /************************/
        NTSTATUS samr_CreateUser(
                [in,ref]      policy_handle *domain_handle,
                [in,ref]      lsa_String *account_name,
-               [in]          uint32 access_mask,
+               [in]          samr_UserAccessMask access_mask,
                [out,ref]     policy_handle *user_handle,
                [out,ref]     uint32 *rid
                );
        const int SAMR_ENUM_USERS_MULTIPLIER = 54;
 
        NTSTATUS samr_EnumDomainUsers(
-               [in,ref]      policy_handle *domain_handle,
+               [in]          policy_handle *domain_handle,
                [in,out,ref]  uint32 *resume_handle,
                [in]          samr_AcctFlags acct_flags,
+               [out,ref]     samr_SamArray **sam,
                [in]          uint32 max_size,
-               [out]         samr_SamArray *sam,
-               [out]         uint32 num_entries
+               [out,ref]     uint32 *num_entries
                );
 
        /************************/
        NTSTATUS samr_CreateDomAlias(
                [in,ref]      policy_handle *domain_handle,
                [in,ref]      lsa_String   *alias_name,
-               [in]          uint32         access_mask,
+               [in]          samr_AliasAccessMask access_mask,
                [out,ref]     policy_handle *alias_handle,
                [out,ref]     uint32        *rid
                );
        /************************/
        /* Function    0x0f     */
        NTSTATUS samr_EnumDomainAliases(
-               [in,ref]      policy_handle *domain_handle,
+               [in]          policy_handle *domain_handle,
                [in,out,ref]  uint32 *resume_handle,
-               [in]          samr_AcctFlags acct_flags,
-               [out]         samr_SamArray *sam,
-               [out]         uint32 num_entries
+               [out,ref]     samr_SamArray **sam,
+               [in]          uint32 max_size,
+               [out,ref]     uint32 *num_entries
                );
 
        /************************/
        /************************/
        /* Function    0x11     */
 
-       NTSTATUS samr_LookupNames(
+       [public] NTSTATUS samr_LookupNames(
                [in,ref]      policy_handle *domain_handle,
                [in,range(0,1000)] uint32 num_names,
                [in,size_is(1000),length_is(num_names)] lsa_String names[],
-               [out]         samr_Ids rids,
-               [out]         samr_Ids types
+               [out,ref]     samr_Ids *rids,
+               [out,ref]     samr_Ids *types
                );
 
 
                [in,ref]      policy_handle *domain_handle,
                [in,range(0,1000)] uint32 num_rids,
                [in,size_is(1000),length_is(num_rids)] uint32 rids[],
-               [out]         lsa_Strings names,
-               [out]         samr_Ids types
+               [out,ref]     lsa_Strings *names,
+               [out,ref]     samr_Ids *types
                );
 
        /************************/
        /* Function    0x13     */
        NTSTATUS samr_OpenGroup(
                [in,ref]      policy_handle *domain_handle,
-               [in]          uint32 access_mask,
+               [in]          samr_GroupAccessMask access_mask,
                [in]          uint32 rid,
                [out,ref]     policy_handle *group_handle
                );
        NTSTATUS samr_QueryGroupInfo(
                [in,ref]                  policy_handle *group_handle,
                [in]                      samr_GroupInfoEnum level,
-               [out,switch_is(level)]    samr_GroupInfo *info
+               [out,ref,switch_is(level)] samr_GroupInfo **info
                );
 
        /************************/
 
        NTSTATUS samr_QueryGroupMember(
                [in,ref]  policy_handle *group_handle,
-               [out]     samr_RidTypeArray *rids
+               [out,ref] samr_RidTypeArray **rids
                );
 
 
        /* Function    0x1b     */
        NTSTATUS samr_OpenAlias (
                [in,ref]      policy_handle *domain_handle,
-               [in]          uint32 access_mask,
+               [in]          samr_AliasAccessMask access_mask,
                [in]          uint32 rid,
                [out,ref]     policy_handle *alias_handle
                );
        NTSTATUS samr_QueryAliasInfo(
                [in,ref]                  policy_handle  *alias_handle,
                [in]                      samr_AliasInfoEnum      level,
-               [out,switch_is(level)]    samr_AliasInfo *info
+               [out,ref,switch_is(level)] samr_AliasInfo **info
                );
 
        /************************/
 
        /************************/
        /* Function    0x22     */
-       NTSTATUS samr_OpenUser(
+       [public] NTSTATUS samr_OpenUser(
                [in,ref]      policy_handle *domain_handle,
-               [in]          uint32 access_mask,
+               [in]          samr_UserAccessMask access_mask,
                [in]          uint32 rid,
                [out,ref]     policy_handle *user_handle
                );
                NTTIME acct_expiry;
        } samr_UserInfo17;
 
+       typedef [public, flag(NDR_PAHEX)] struct {
+               uint8 hash[16];
+       } samr_Password;
+
        typedef struct {
-               lsa_String parameters;
+               samr_Password lm_pwd;
+               samr_Password nt_pwd;
+               boolean8 lm_pwd_active;
+               boolean8 nt_pwd_active;
+       } samr_UserInfo18;
+
+       typedef struct {
+               lsa_BinaryString parameters;
        } samr_UserInfo20;
 
        /* this defines the bits used for fields_present in info21 */
        typedef [bitmap32bit] bitmap {
-               SAMR_FIELD_ACCOUNT_NAME = 0x00000001,
-               SAMR_FIELD_FULL_NAME    = 0x00000002,
-               SAMR_FIELD_DESCRIPTION  = 0x00000010,
-               SAMR_FIELD_COMMENT      = 0x00000020,
-               SAMR_FIELD_LOGON_SCRIPT = 0x00000100,
-               SAMR_FIELD_PROFILE_PATH = 0x00000200,
-               SAMR_FIELD_WORKSTATIONS = 0x00000400,
-               SAMR_FIELD_LOGON_HOURS  = 0x00002000,
-               SAMR_FIELD_ACCT_FLAGS   = 0x00100000,
-               SAMR_FIELD_PARAMETERS   = 0x00200000,
-               SAMR_FIELD_COUNTRY_CODE = 0x00400000,
-               SAMR_FIELD_CODE_PAGE    = 0x00800000,
-               SAMR_FIELD_PASSWORD     = 0x01000000, /* either of these */
-               SAMR_FIELD_PASSWORD2    = 0x02000000 /* two bits seems to work */
+               SAMR_FIELD_ACCOUNT_NAME     = 0x00000001,
+               SAMR_FIELD_FULL_NAME        = 0x00000002,
+               SAMR_FIELD_RID              = 0x00000004,
+               SAMR_FIELD_PRIMARY_GID      = 0x00000008,
+               SAMR_FIELD_DESCRIPTION      = 0x00000010,
+               SAMR_FIELD_COMMENT          = 0x00000020,
+               SAMR_FIELD_HOME_DIRECTORY   = 0x00000040,
+               SAMR_FIELD_HOME_DRIVE       = 0x00000080,
+               SAMR_FIELD_LOGON_SCRIPT     = 0x00000100,
+               SAMR_FIELD_PROFILE_PATH     = 0x00000200,
+               SAMR_FIELD_WORKSTATIONS     = 0x00000400,
+               SAMR_FIELD_LAST_LOGON       = 0x00000800,
+               SAMR_FIELD_LAST_LOGOFF      = 0x00001000,
+               SAMR_FIELD_LOGON_HOURS      = 0x00002000,
+               SAMR_FIELD_BAD_PWD_COUNT    = 0x00004000,
+               SAMR_FIELD_NUM_LOGONS       = 0x00008000,
+               SAMR_FIELD_ALLOW_PWD_CHANGE = 0x00010000,
+               SAMR_FIELD_FORCE_PWD_CHANGE = 0x00020000,
+               SAMR_FIELD_LAST_PWD_CHANGE  = 0x00040000,
+               SAMR_FIELD_ACCT_EXPIRY      = 0x00080000,
+               SAMR_FIELD_ACCT_FLAGS       = 0x00100000,
+               SAMR_FIELD_PARAMETERS       = 0x00200000,
+               SAMR_FIELD_COUNTRY_CODE     = 0x00400000,
+               SAMR_FIELD_CODE_PAGE        = 0x00800000,
+               SAMR_FIELD_PASSWORD         = 0x01000000, /* either of these */
+               SAMR_FIELD_PASSWORD2        = 0x02000000, /* two bits seems to work */
+               SAMR_FIELD_PRIVATE_DATA     = 0x04000000,
+               SAMR_FIELD_EXPIRED_FLAG     = 0x08000000,
+               SAMR_FIELD_SEC_DESC         = 0x10000000,
+               SAMR_FIELD_OWF_PWD          = 0x20000000
        } samr_FieldsPresent;
 
+       /* used for 'password_expired' in samr_UserInfo21 */
+       const int PASS_MUST_CHANGE_AT_NEXT_LOGON = 0x01;
+       const int PASS_DONT_CHANGE_AT_NEXT_LOGON = 0x00;
+
        typedef struct {
                NTTIME last_logon;
                NTTIME last_logoff;
                lsa_String description;
                lsa_String workstations;
                lsa_String comment;
-               lsa_String parameters;
+               lsa_BinaryString parameters;
                lsa_String unknown1;
                lsa_String unknown2;
                lsa_String unknown3;
                [case(14)] samr_UserInfo14 info14;
                [case(16)] samr_UserInfo16 info16;
                [case(17)] samr_UserInfo17 info17;
+               [case(18)] samr_UserInfo18 info18;
                [case(20)] samr_UserInfo20 info20;
                [case(21)] samr_UserInfo21 info21;
                [case(23)] samr_UserInfo23 info23;
                [case(26)] samr_UserInfo26 info26;
        } samr_UserInfo;
 
-       NTSTATUS samr_QueryUserInfo(
+       [public] NTSTATUS samr_QueryUserInfo(
                [in,ref]                  policy_handle *user_handle,
                [in]                      uint16 level,
-               [out,switch_is(level)]    samr_UserInfo *info
+               [out,ref,switch_is(level)] samr_UserInfo **info
                );
 
 
        /************************/
        /* Function    0x25     */
-       NTSTATUS samr_SetUserInfo(
+       [public] NTSTATUS samr_SetUserInfo(
                [in,ref]                   policy_handle *user_handle,
                [in]                       uint16 level,
                [in,ref,switch_is(level)]  samr_UserInfo *info
 
        /************************/
        /* Function    0x26     */
-       typedef [public, flag(NDR_PAHEX)] struct {
-               uint8 hash[16];
-       } samr_Password;
-
        /*
          this is a password change interface that doesn't give
          the server the plaintext password. Depricated.
        NTSTATUS samr_ChangePasswordUser(
                [in,ref]    policy_handle *user_handle,
                [in]        boolean8 lm_present,
-               [in]        samr_Password *old_lm_crypted,
-               [in]        samr_Password *new_lm_crypted,
+               [in,unique] samr_Password *old_lm_crypted,
+               [in,unique] samr_Password *new_lm_crypted,
                [in]        boolean8 nt_present,
-               [in]        samr_Password *old_nt_crypted,
-               [in]        samr_Password *new_nt_crypted,
+               [in,unique] samr_Password *old_nt_crypted,
+               [in,unique] samr_Password *new_nt_crypted,
                [in]        boolean8 cross1_present,
-               [in]        samr_Password *nt_cross,
+               [in,unique] samr_Password *nt_cross,
                [in]        boolean8 cross2_present,
-               [in]        samr_Password *lm_cross
+               [in,unique] samr_Password *lm_cross
                );
 
        /************************/
 
        NTSTATUS samr_GetGroupsForUser(
                [in,ref]   policy_handle *user_handle,
-               [out]      samr_RidWithAttributeArray  *rids
+               [out,ref]  samr_RidWithAttributeArray  **rids
                );
 
        /************************/
                uint32    rid;
                samr_AcctFlags acct_flags;
                lsa_String account_name;
-               lsa_String full_name;
                lsa_String description;
+               lsa_String full_name;
        } samr_DispEntryGeneral;
 
        typedef struct {
 
        typedef struct {
                uint32    idx;
-               lsa_AsciiString account_name;
+               uint32    rid;
+               samr_GroupAttrs acct_flags;
+               lsa_String account_name;
+               lsa_String description;
+       } samr_DispEntryFullGroup;
+
+       typedef struct {
+               uint32 count;
+               [size_is(count)] samr_DispEntryFullGroup *entries;
+       } samr_DispInfoFullGroups;
+
+       typedef struct {
+               uint32    idx;
+               lsa_AsciiStringLarge account_name;
        } samr_DispEntryAscii;
 
        typedef struct {
        typedef [switch_type(uint16)] union {
                [case(1)] samr_DispInfoGeneral info1;/* users */
                [case(2)] samr_DispInfoFull info2; /* trust accounts? */
-               [case(3)] samr_DispInfoFull info3; /* groups */
+               [case(3)] samr_DispInfoFullGroups info3; /* groups */
                [case(4)] samr_DispInfoAscii info4; /* users */
                [case(5)] samr_DispInfoAscii info5; /* groups */
        } samr_DispInfo;
                [in]        uint32 start_idx,
                [in]        uint32 max_entries,
                [in]        uint32 buf_size,
-               [out]       uint32 total_size,
-               [out]       uint32 returned_size,
-               [out,switch_is(level)] samr_DispInfo info
+               [out,ref]   uint32 *total_size,
+               [out,ref]   uint32 *returned_size,
+               [out,ref,switch_is(level)] samr_DispInfo *info
                );
 
 
        NTSTATUS samr_GetDisplayEnumerationIndex(
                [in,ref]    policy_handle *domain_handle,
                [in]        uint16 level,
-               [in]        lsa_String name,
-               [out]       uint32 idx
+               [in,ref]    lsa_String *name,
+               [out,ref]   uint32 *idx
                );
 
 
                samr_PasswordProperties password_properties;
        } samr_PwInfo;
 
-       NTSTATUS samr_GetUserPwInfo(
+       [public] NTSTATUS samr_GetUserPwInfo(
                [in,ref]    policy_handle *user_handle,
-               [out]       samr_PwInfo info
+               [out,ref]   samr_PwInfo *info
                );
 
        /************************/
        NTSTATUS samr_QueryDomainInfo2(
                [in,ref]      policy_handle *domain_handle,
                [in]          uint16 level,
-               [out,switch_is(level)] samr_DomainInfo *info
+               [out,ref,switch_is(level)] samr_DomainInfo **info
                );
 
        /************************/
        NTSTATUS samr_QueryUserInfo2(
                [in,ref]                  policy_handle *user_handle,
                [in]                      uint16 level,
-               [out,switch_is(level)]    samr_UserInfo *info
+               [out,ref,switch_is(level)]    samr_UserInfo *info
                );
 
        /************************/
                [in]        uint32 start_idx,
                [in]        uint32 max_entries,
                [in]        uint32 buf_size,
-               [out]       uint32 total_size,
-               [out]       uint32 returned_size,
-               [out,switch_is(level)] samr_DispInfo info
+               [out,ref]   uint32 *total_size,
+               [out,ref]   uint32 *returned_size,
+               [out,ref,switch_is(level)] samr_DispInfo *info
                );
 
        /************************/
        NTSTATUS samr_GetDisplayEnumerationIndex2(
                [in,ref]    policy_handle *domain_handle,
                [in]        uint16 level,
-               [in]        lsa_String name,
-               [out]       uint32 idx
+               [in,ref]    lsa_String *name,
+               [out,ref]   uint32 *idx
                );
 
 
                [in,ref]      policy_handle *domain_handle,
                [in,ref]      lsa_String *account_name,
                [in]          samr_AcctFlags acct_flags,
-               [in]          uint32 access_mask,
+               [in]          samr_UserAccessMask access_mask,
                [out,ref]     policy_handle *user_handle,
                [out,ref]     uint32 *access_granted,
                [out,ref]     uint32 *rid
                [in]        uint32 start_idx,
                [in]        uint32 max_entries,
                [in]        uint32 buf_size,
-               [out]       uint32 total_size,
-               [out]       uint32 returned_size,
-               [out,switch_is(level)] samr_DispInfo info
+               [out,ref]   uint32 *total_size,
+               [out,ref]   uint32 *returned_size,
+               [out,ref,switch_is(level)] samr_DispInfo *info
                );
 
        /************************/
        /* Function    0x36     */
 
        NTSTATUS samr_OemChangePasswordUser2(
-               [in]              lsa_AsciiString *server,
+               [in,unique]       lsa_AsciiString *server,
                [in,ref]          lsa_AsciiString *account,
-               [in]              samr_CryptPassword *password,
-               [in]              samr_Password *hash
+               [in,unique]       samr_CryptPassword *password,
+               [in,unique]       samr_Password *hash
                );
 
        /************************/
        /* Function    0x37     */
        NTSTATUS samr_ChangePasswordUser2(
-               [in]              lsa_String *server,
+               [in,unique]       lsa_String *server,
                [in,ref]          lsa_String *account,
-               [in]              samr_CryptPassword *nt_password,
-               [in]              samr_Password *nt_verifier,
+               [in,unique]       samr_CryptPassword *nt_password,
+               [in,unique]       samr_Password *nt_verifier,
                [in]              boolean8 lm_change,
-               [in]              samr_CryptPassword *lm_password,
-               [in]              samr_Password *lm_verifier
+               [in,unique]       samr_CryptPassword *lm_password,
+               [in,unique]       samr_Password *lm_verifier
                );
 
        /************************/
        /* Function    0x38     */
        NTSTATUS samr_GetDomPwInfo(
-               [in]        lsa_String *domain_name,
-               [out]       samr_PwInfo info
+               [in,unique] lsa_String *domain_name,
+               [out,ref]   samr_PwInfo *info
                );
 
        /************************/
        /* Function    0x39     */
        NTSTATUS samr_Connect2(
-               [in,string,charset(UTF16)] uint16 *system_name,
-               [in] uint32 access_mask,
+               [in,unique,string,charset(UTF16)] uint16 *system_name,
+               [in] samr_ConnectAccessMask access_mask,
                [out,ref]  policy_handle *connect_handle
                );
 
        /*
          seems to be an exact alias for samr_SetUserInfo() 
        */
-       NTSTATUS samr_SetUserInfo2(
+       [public] NTSTATUS samr_SetUserInfo2(
                [in,ref]                   policy_handle *user_handle,
                [in]                       uint16 level,
                [in,ref,switch_is(level)]  samr_UserInfo *info
        /* Function    0x3c     */
        NTSTATUS samr_GetBootKeyInformation(
                [in,ref]   policy_handle *domain_handle,
-               [out]      uint32 unknown
+               [out,ref]  uint32 *unknown
                );
 
        /************************/
        /* Function    0x3d     */
        NTSTATUS samr_Connect3(
-               [in,string,charset(UTF16)] uint16 *system_name,
+               [in,unique,string,charset(UTF16)] uint16 *system_name,
                /* this unknown value seems to be completely ignored by w2k3 */
                [in] uint32 unknown,
-               [in] uint32 access_mask,
+               [in] samr_ConnectAccessMask access_mask,
                [out,ref]  policy_handle *connect_handle
                );
 
        /************************/
        /* Function    0x3e     */
+
+       typedef enum {
+               SAMR_CONNECT_PRE_W2K    = 1,
+               SAMR_CONNECT_W2K        = 2,
+               SAMR_CONNECT_AFTER_W2K  = 3
+       } samr_ConnectVersion;
+
        NTSTATUS samr_Connect4(
-               [in,string,charset(UTF16)] uint16 *system_name,
-               [in] uint32 unknown,
-               [in] uint32 access_mask,
+               [in,unique,string,charset(UTF16)] uint16 *system_name,
+               [in] samr_ConnectVersion client_version,
+               [in] samr_ConnectAccessMask access_mask,
                [out,ref]  policy_handle *connect_handle
                );
 
        } samr_ChangeReject;
 
        NTSTATUS samr_ChangePasswordUser3(
-               [in]              lsa_String *server,
+               [in,unique]       lsa_String *server,
                [in,ref]          lsa_String *account,
-               [in]              samr_CryptPassword *nt_password,
-               [in]              samr_Password *nt_verifier,
+               [in,unique]       samr_CryptPassword *nt_password,
+               [in,unique]       samr_Password *nt_verifier,
                [in]              boolean8 lm_change,
-               [in]              samr_CryptPassword *lm_password,
-               [in]              samr_Password *lm_verifier,
-               [in]              samr_CryptPassword *password3,
-               [out]             samr_DomInfo1 *dominfo,
-               [out]             samr_ChangeReject *reject
+               [in,unique]       samr_CryptPassword *lm_password,
+               [in,unique]       samr_Password *lm_verifier,
+               [in,unique]       samr_CryptPassword *password3,
+               [out,ref]         samr_DomInfo1 **dominfo,
+               [out,ref]         samr_ChangeReject **reject
                );
 
        /************************/
        /* Function    0x40      */
 
        typedef struct {
-               uint32         unknown1; /* w2k3 gives 3 */
+               samr_ConnectVersion client_version; /* w2k3 gives 3 */
                uint32         unknown2; /* w2k3 gives 0 */
        } samr_ConnectInfo1;
 
                [case(1)]  samr_ConnectInfo1 info1;
        } samr_ConnectInfo;
 
-       NTSTATUS samr_Connect5(
-               [in,string,charset(UTF16)] uint16 *system_name,
-               [in]       uint32             access_mask,
-               [in,out]   uint32             level,
-               [in,out,switch_is(level),ref] samr_ConnectInfo *info,
+       [public] NTSTATUS samr_Connect5(
+               [in,unique,string,charset(UTF16)] uint16 *system_name,
+               [in]       samr_ConnectAccessMask  access_mask,
+               [in]       uint32             level_in,
+               [in,ref,switch_is(level_in)] samr_ConnectInfo *info_in,
+               [out,ref]  uint32             *level_out,
+               [out,ref,switch_is(*level_out)] samr_ConnectInfo *info_out,
                [out,ref]  policy_handle      *connect_handle
                );
 
        NTSTATUS samr_RidToSid(
                [in,ref]    policy_handle *domain_handle,
                [in]        uint32        rid,
-               [out]       dom_sid2      *sid
+               [out,ref]   dom_sid2      *sid
                );
 
 
        */
 
        NTSTATUS samr_SetDsrmPassword(
-               [in]       lsa_String *name,
+               [in,unique] lsa_String *name,
                [in]       uint32 unknown,
-               [in]       samr_Password *hash
+               [in,unique] samr_Password *hash
                );
 
 
        /************************/
        /* Function    0x43     */
-       /*
-         I haven't been able to work out the format of this one yet.
-         Seems to start with a switch level for a union?
-       */
-       NTSTATUS samr_ValidatePassword();
+       /************************/
+       typedef [bitmap32bit] bitmap {
+               SAMR_VALIDATE_FIELD_PASSWORD_LAST_SET           = 0x00000001,
+               SAMR_VALIDATE_FIELD_BAD_PASSWORD_TIME           = 0x00000002,
+               SAMR_VALIDATE_FIELD_LOCKOUT_TIME                = 0x00000004,
+               SAMR_VALIDATE_FIELD_BAD_PASSWORD_COUNT          = 0x00000008,
+               SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_LENGTH     = 0x00000010,
+               SAMR_VALIDATE_FIELD_PASSWORD_HISTORY            = 0x00000020
+       } samr_ValidateFieldsPresent;
+
+       typedef enum {
+               NetValidateAuthentication = 1,
+               NetValidatePasswordChange= 2,
+               NetValidatePasswordReset = 3
+       } samr_ValidatePasswordLevel;
+
+       /* NetApi maps samr_ValidationStatus errors to WERRORs. Haven't
+        * identified the mapping of
+        * - NERR_PasswordFilterError
+        * - NERR_PasswordExpired and
+        * - NERR_PasswordCantChange
+        * yet - Guenther
+        */
+
+       typedef enum {
+               SAMR_VALIDATION_STATUS_SUCCESS = 0,
+               SAMR_VALIDATION_STATUS_PASSWORD_MUST_CHANGE = 1,
+               SAMR_VALIDATION_STATUS_ACCOUNT_LOCKED_OUT = 2,
+               SAMR_VALIDATION_STATUS_BAD_PASSWORD = 4,
+               SAMR_VALIDATION_STATUS_PWD_HISTORY_CONFLICT = 5,
+               SAMR_VALIDATION_STATUS_PWD_TOO_SHORT = 6,
+               SAMR_VALIDATION_STATUS_PWD_TOO_LONG = 7,
+               SAMR_VALIDATION_STATUS_NOT_COMPLEX_ENOUGH = 8,
+               SAMR_VALIDATION_STATUS_PASSWORD_TOO_RECENT = 9
+       } samr_ValidationStatus;
+
+       typedef struct {
+               uint32 length;
+               [size_is(length)] uint8 *data;
+        } samr_ValidationBlob;
+
+       typedef struct {
+               samr_ValidateFieldsPresent fields_present;
+               NTTIME_hyper last_password_change;
+               NTTIME_hyper bad_password_time;
+               NTTIME_hyper lockout_time;
+               uint32 bad_pwd_count;
+               uint32 pwd_history_len;
+               [size_is(pwd_history_len)] samr_ValidationBlob *pwd_history;
+       } samr_ValidatePasswordInfo;
+
+       typedef struct {
+               samr_ValidatePasswordInfo info;
+               samr_ValidationStatus status;
+       } samr_ValidatePasswordRepCtr;
+
+       typedef [switch_type(uint16)] union {
+               [case(1)] samr_ValidatePasswordRepCtr ctr1;
+               [case(2)] samr_ValidatePasswordRepCtr ctr2;
+               [case(3)] samr_ValidatePasswordRepCtr ctr3;
+       } samr_ValidatePasswordRep;
+
+       typedef struct {
+               samr_ValidatePasswordInfo info;
+               lsa_StringLarge password;
+               lsa_StringLarge account;
+               samr_ValidationBlob hash;
+               boolean8 pwd_must_change_at_next_logon;
+               boolean8 clear_lockout;
+       } samr_ValidatePasswordReq3;
+
+       typedef struct {
+               samr_ValidatePasswordInfo info;
+               lsa_StringLarge password;
+               lsa_StringLarge account;
+               samr_ValidationBlob hash;
+               boolean8 password_matched;
+       } samr_ValidatePasswordReq2;
+
+       typedef struct {
+               samr_ValidatePasswordInfo info;
+               boolean8 password_matched;
+       } samr_ValidatePasswordReq1;
+
+       typedef [switch_type(uint16)] union {
+               [case(1)] samr_ValidatePasswordReq1 req1;
+               [case(2)] samr_ValidatePasswordReq2 req2;
+               [case(3)] samr_ValidatePasswordReq3 req3;
+       } samr_ValidatePasswordReq;
+
+       NTSTATUS samr_ValidatePassword(
+               [in] samr_ValidatePasswordLevel level,
+               [in,switch_is(level)] samr_ValidatePasswordReq req,
+               [out,ref,switch_is(level)] samr_ValidatePasswordRep *rep
+               );
 }