s3-secrets: only include secrets.h when needed.
[samba.git] / source3 / rpc_server / srv_samr_nt.c
index da649f98d9f63cce8dc93f0b75bb823160a4bc26..e101240dbeedc69c825a4acd142fe244f3fe2c2a 100644 (file)
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/srv_samr.h"
+#include "rpc_server/srv_samr_util.h"
+#include "../lib/crypto/arcfour.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
@@ -72,7 +76,7 @@ struct samr_alias_info {
 };
 
 typedef struct disp_info {
-       DOM_SID sid; /* identify which domain this is. */
+       struct dom_sid sid; /* identify which domain this is. */
        struct pdb_search *users; /* querydispinfo 1 and 4 */
        struct pdb_search *machines; /* querydispinfo 2 */
        struct pdb_search *groups; /* querydispinfo 3 and 5, enumgroups */
@@ -119,15 +123,15 @@ static const struct generic_mapping ali_generic_mapping = {
 /*******************************************************************
 *******************************************************************/
 
-static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size,
+static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, struct security_descriptor **psd, size_t *sd_size,
                                      const struct generic_mapping *map,
-                                    DOM_SID *sid, uint32 sid_access )
+                                    struct dom_sid *sid, uint32 sid_access )
 {
-       DOM_SID domadmin_sid;
-       SEC_ACE ace[5];         /* at most 5 entries */
+       struct dom_sid domadmin_sid;
+       struct security_ace ace[5];             /* at most 5 entries */
        size_t i = 0;
 
-       SEC_ACL *psa = NULL;
+       struct security_acl *psa = NULL;
 
        /* basic access for Everyone */
 
@@ -144,8 +148,8 @@ static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd
        /* Add Full Access for Domain Admins if we are a DC */
 
        if ( IS_DC ) {
-               sid_copy( &domadmin_sid, get_global_sam_sid() );
-               sid_append_rid( &domadmin_sid, DOMAIN_GROUP_RID_ADMINS );
+               sid_compose(&domadmin_sid, get_global_sam_sid(),
+                           DOMAIN_RID_ADMINS);
                init_sec_ace(&ace[i++], &domadmin_sid,
                        SEC_ACE_TYPE_ACCESS_ALLOWED, map->generic_all, 0);
        }
@@ -174,7 +178,7 @@ static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd
  level of access for further checks.
 ********************************************************************/
 
-NTSTATUS access_check_object( SEC_DESC *psd, NT_USER_TOKEN *token,
+NTSTATUS access_check_object( struct security_descriptor *psd, NT_USER_TOKEN *token,
                                           SE_PRIV *rights, uint32 rights_mask,
                                           uint32 des_access, uint32 *acc_granted,
                                          const char *debug )
@@ -236,8 +240,9 @@ done:
  Map any MAXIMUM_ALLOWED_ACCESS request to a valid access set.
 ********************************************************************/
 
-void map_max_allowed_access(const NT_USER_TOKEN *token,
-                                       uint32_t *pacc_requested)
+void map_max_allowed_access(const NT_USER_TOKEN *nt_token,
+                           const struct unix_user_token *unix_token,
+                           uint32_t *pacc_requested)
 {
        if (!((*pacc_requested) & MAXIMUM_ALLOWED_ACCESS)) {
                return;
@@ -248,25 +253,25 @@ void map_max_allowed_access(const NT_USER_TOKEN *token,
        *pacc_requested = GENERIC_READ_ACCESS|GENERIC_EXECUTE_ACCESS;
 
        /* root gets anything. */
-       if (geteuid() == sec_initial_uid()) {
+       if (unix_token->uid == sec_initial_uid()) {
                *pacc_requested |= GENERIC_ALL_ACCESS;
                return;
        }
 
        /* Full Access for 'BUILTIN\Administrators' and 'BUILTIN\Account Operators */
 
-       if (is_sid_in_token(token, &global_sid_Builtin_Administrators) ||
-                       is_sid_in_token(token, &global_sid_Builtin_Account_Operators)) {
+       if (is_sid_in_token(nt_token, &global_sid_Builtin_Administrators) ||
+                       is_sid_in_token(nt_token, &global_sid_Builtin_Account_Operators)) {
                *pacc_requested |= GENERIC_ALL_ACCESS;
                return;
        }
 
        /* Full access for DOMAIN\Domain Admins. */
        if ( IS_DC ) {
-               DOM_SID domadmin_sid;
-               sid_copy( &domadmin_sid, get_global_sam_sid() );
-               sid_append_rid( &domadmin_sid, DOMAIN_GROUP_RID_ADMINS );
-               if (is_sid_in_token(token, &domadmin_sid)) {
+               struct dom_sid domadmin_sid;
+               sid_compose(&domadmin_sid, get_global_sam_sid(),
+                           DOMAIN_RID_ADMINS);
+               if (is_sid_in_token(nt_token, &domadmin_sid)) {
                        *pacc_requested |= GENERIC_ALL_ACCESS;
                        return;
                }
@@ -403,7 +408,7 @@ static void set_disp_info_cache_timeout(DISP_INFO *disp_info, time_t secs_fromno
                  (unsigned int)secs_fromnow ));
 
        disp_info->cache_timeout_event = event_add_timed(
-               smbd_event_context(), NULL,
+               server_event_context(), NULL,
                timeval_current_ofs(secs_fromnow, 0),
                disp_info_cache_idle_timeout_handler, (void *)disp_info);
 }
@@ -513,7 +518,7 @@ static uint32 count_sam_aliases(struct disp_info *info)
  _samr_Close
  ********************************************************************/
 
-NTSTATUS _samr_Close(pipes_struct *p, struct samr_Close *r)
+NTSTATUS _samr_Close(struct pipes_struct *p, struct samr_Close *r)
 {
        if (!close_policy_hnd(p, r->in.handle)) {
                return NT_STATUS_INVALID_HANDLE;
@@ -528,12 +533,12 @@ NTSTATUS _samr_Close(pipes_struct *p, struct samr_Close *r)
  _samr_OpenDomain
  ********************************************************************/
 
-NTSTATUS _samr_OpenDomain(pipes_struct *p,
+NTSTATUS _samr_OpenDomain(struct pipes_struct *p,
                          struct samr_OpenDomain *r)
 {
        struct samr_connect_info *cinfo;
        struct samr_domain_info *dinfo;
-       SEC_DESC *psd = NULL;
+       struct security_descriptor *psd = NULL;
        uint32    acc_granted;
        uint32    des_access = r->in.access_mask;
        NTSTATUS  status;
@@ -550,7 +555,9 @@ NTSTATUS _samr_OpenDomain(pipes_struct *p,
        }
 
        /*check if access can be granted as requested by client. */
-       map_max_allowed_access(p->server_info->ptok, &des_access);
+       map_max_allowed_access(p->server_info->ptok,
+                              &p->server_info->utok,
+                              &des_access);
 
        make_samr_object_sd( p->mem_ctx, &psd, &sd_size, &dom_generic_mapping, NULL, 0 );
        se_map_generic( &des_access, &dom_generic_mapping );
@@ -603,7 +610,7 @@ NTSTATUS _samr_OpenDomain(pipes_struct *p,
  _samr_GetUserPwInfo
  ********************************************************************/
 
-NTSTATUS _samr_GetUserPwInfo(pipes_struct *p,
+NTSTATUS _samr_GetUserPwInfo(struct pipes_struct *p,
                             struct samr_GetUserPwInfo *r)
 {
        struct samr_user_info *uinfo;
@@ -636,9 +643,9 @@ NTSTATUS _samr_GetUserPwInfo(pipes_struct *p,
        switch (sid_type) {
                case SID_NAME_USER:
                        become_root();
-                       pdb_get_account_policy(AP_MIN_PASSWORD_LEN,
+                       pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_LEN,
                                               &min_password_length);
-                       pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
+                       pdb_get_account_policy(PDB_POLICY_USER_MUST_LOGON_TO_CHG_PASS,
                                               &password_properties);
                        unbecome_root();
 
@@ -663,12 +670,12 @@ NTSTATUS _samr_GetUserPwInfo(pipes_struct *p,
  _samr_SetSecurity
  ********************************************************************/
 
-NTSTATUS _samr_SetSecurity(pipes_struct *p,
+NTSTATUS _samr_SetSecurity(struct pipes_struct *p,
                           struct samr_SetSecurity *r)
 {
        struct samr_user_info *uinfo;
        uint32 i;
-       SEC_ACL *dacl;
+       struct security_acl *dacl;
        bool ret;
        struct samu *sampass=NULL;
        NTSTATUS status;
@@ -725,7 +732,7 @@ NTSTATUS _samr_SetSecurity(pipes_struct *p,
 /*******************************************************************
   build correct perms based on policies and password times for _samr_query_sec_obj
 *******************************************************************/
-static bool check_change_pw_access(TALLOC_CTX *mem_ctx, DOM_SID *user_sid)
+static bool check_change_pw_access(TALLOC_CTX *mem_ctx, struct dom_sid *user_sid)
 {
        struct samu *sampass=NULL;
        bool ret;
@@ -760,7 +767,7 @@ static bool check_change_pw_access(TALLOC_CTX *mem_ctx, DOM_SID *user_sid)
  _samr_QuerySecurity
  ********************************************************************/
 
-NTSTATUS _samr_QuerySecurity(pipes_struct *p,
+NTSTATUS _samr_QuerySecurity(struct pipes_struct *p,
                             struct samr_QuerySecurity *r)
 {
        struct samr_connect_info *cinfo;
@@ -769,11 +776,11 @@ NTSTATUS _samr_QuerySecurity(pipes_struct *p,
        struct samr_group_info *ginfo;
        struct samr_alias_info *ainfo;
        NTSTATUS status;
-       SEC_DESC * psd = NULL;
-       size_t sd_size;
+       struct security_descriptor * psd = NULL;
+       size_t sd_size = 0;
 
        cinfo = policy_handle_find(p, r->in.handle,
-                                  STD_RIGHT_READ_CONTROL_ACCESS, NULL,
+                                  SEC_STD_READ_CONTROL, NULL,
                                   struct samr_connect_info, &status);
        if (NT_STATUS_IS_OK(status)) {
                DEBUG(5,("_samr_QuerySecurity: querying security on SAM\n"));
@@ -783,7 +790,7 @@ NTSTATUS _samr_QuerySecurity(pipes_struct *p,
        }
 
        dinfo = policy_handle_find(p, r->in.handle,
-                                  STD_RIGHT_READ_CONTROL_ACCESS, NULL,
+                                  SEC_STD_READ_CONTROL, NULL,
                                   struct samr_domain_info, &status);
        if (NT_STATUS_IS_OK(status)) {
                DEBUG(5,("_samr_QuerySecurity: querying security on Domain "
@@ -798,7 +805,7 @@ NTSTATUS _samr_QuerySecurity(pipes_struct *p,
        }
 
        uinfo = policy_handle_find(p, r->in.handle,
-                                  STD_RIGHT_READ_CONTROL_ACCESS, NULL,
+                                  SEC_STD_READ_CONTROL, NULL,
                                   struct samr_user_info, &status);
        if (NT_STATUS_IS_OK(status)) {
                DEBUG(10,("_samr_QuerySecurity: querying security on user "
@@ -819,7 +826,7 @@ NTSTATUS _samr_QuerySecurity(pipes_struct *p,
        }
 
        ginfo = policy_handle_find(p, r->in.handle,
-                                  STD_RIGHT_READ_CONTROL_ACCESS, NULL,
+                                  SEC_STD_READ_CONTROL, NULL,
                                   struct samr_group_info, &status);
        if (NT_STATUS_IS_OK(status)) {
                /*
@@ -837,7 +844,7 @@ NTSTATUS _samr_QuerySecurity(pipes_struct *p,
        }
 
        ainfo = policy_handle_find(p, r->in.handle,
-                                  STD_RIGHT_READ_CONTROL_ACCESS, NULL,
+                                  SEC_STD_READ_CONTROL, NULL,
                                   struct samr_alias_info, &status);
        if (NT_STATUS_IS_OK(status)) {
                /*
@@ -916,7 +923,7 @@ static NTSTATUS make_user_sam_entry_list(TALLOC_CTX *ctx,
  _samr_EnumDomainUsers
  ********************************************************************/
 
-NTSTATUS _samr_EnumDomainUsers(pipes_struct *p,
+NTSTATUS _samr_EnumDomainUsers(struct pipes_struct *p,
                               struct samr_EnumDomainUsers *r)
 {
        NTSTATUS status;
@@ -1055,7 +1062,7 @@ static void make_group_sam_entry_list(TALLOC_CTX *ctx,
  _samr_EnumDomainGroups
  ********************************************************************/
 
-NTSTATUS _samr_EnumDomainGroups(pipes_struct *p,
+NTSTATUS _samr_EnumDomainGroups(struct pipes_struct *p,
                                struct samr_EnumDomainGroups *r)
 {
        NTSTATUS status;
@@ -1132,7 +1139,7 @@ NTSTATUS _samr_EnumDomainGroups(pipes_struct *p,
  _samr_EnumDomainAliases
  ********************************************************************/
 
-NTSTATUS _samr_EnumDomainAliases(pipes_struct *p,
+NTSTATUS _samr_EnumDomainAliases(struct pipes_struct *p,
                                 struct samr_EnumDomainAliases *r)
 {
        NTSTATUS status;
@@ -1399,7 +1406,7 @@ static NTSTATUS init_samr_dispinfo_5(TALLOC_CTX *ctx,
  _samr_QueryDisplayInfo
  ********************************************************************/
 
-NTSTATUS _samr_QueryDisplayInfo(pipes_struct *p,
+NTSTATUS _samr_QueryDisplayInfo(struct pipes_struct *p,
                                struct samr_QueryDisplayInfo *r)
 {
        NTSTATUS status;
@@ -1612,7 +1619,7 @@ NTSTATUS _samr_QueryDisplayInfo(pipes_struct *p,
  _samr_QueryDisplayInfo2
 ****************************************************************/
 
-NTSTATUS _samr_QueryDisplayInfo2(pipes_struct *p,
+NTSTATUS _samr_QueryDisplayInfo2(struct pipes_struct *p,
                                 struct samr_QueryDisplayInfo2 *r)
 {
        struct samr_QueryDisplayInfo q;
@@ -1634,7 +1641,7 @@ NTSTATUS _samr_QueryDisplayInfo2(pipes_struct *p,
  _samr_QueryDisplayInfo3
 ****************************************************************/
 
-NTSTATUS _samr_QueryDisplayInfo3(pipes_struct *p,
+NTSTATUS _samr_QueryDisplayInfo3(struct pipes_struct *p,
                                 struct samr_QueryDisplayInfo3 *r)
 {
        struct samr_QueryDisplayInfo q;
@@ -1656,7 +1663,7 @@ NTSTATUS _samr_QueryDisplayInfo3(pipes_struct *p,
  _samr_QueryAliasInfo
  ********************************************************************/
 
-NTSTATUS _samr_QueryAliasInfo(pipes_struct *p,
+NTSTATUS _samr_QueryAliasInfo(struct pipes_struct *p,
                              struct samr_QueryAliasInfo *r)
 {
        struct samr_alias_info *ainfo;
@@ -1718,7 +1725,7 @@ NTSTATUS _samr_QueryAliasInfo(pipes_struct *p,
  _samr_LookupNames
  ********************************************************************/
 
-NTSTATUS _samr_LookupNames(pipes_struct *p,
+NTSTATUS _samr_LookupNames(struct pipes_struct *p,
                           struct samr_LookupNames *r)
 {
        struct samr_domain_info *dinfo;
@@ -1802,7 +1809,7 @@ NTSTATUS _samr_LookupNames(pipes_struct *p,
  _samr_ChangePasswordUser
 ****************************************************************/
 
-NTSTATUS _samr_ChangePasswordUser(pipes_struct *p,
+NTSTATUS _samr_ChangePasswordUser(struct pipes_struct *p,
                                  struct samr_ChangePasswordUser *r)
 {
        NTSTATUS status;
@@ -1913,10 +1920,9 @@ NTSTATUS _samr_ChangePasswordUser(pipes_struct *p,
  _samr_ChangePasswordUser2
  ********************************************************************/
 
-NTSTATUS _samr_ChangePasswordUser2(pipes_struct *p,
+NTSTATUS _samr_ChangePasswordUser2(struct pipes_struct *p,
                                   struct samr_ChangePasswordUser2 *r)
 {
-       struct smbd_server_connection *sconn = smbd_server_conn;
        NTSTATUS status;
        fstring user_name;
        fstring wks;
@@ -1933,7 +1939,7 @@ NTSTATUS _samr_ChangePasswordUser2(pipes_struct *p,
         * function.
         */
 
-       (void)map_username(sconn, user_name);
+       (void)map_username(user_name);
 
        /*
         * UNIX username case mangling not required, pass_oem_change
@@ -1960,10 +1966,9 @@ NTSTATUS _samr_ChangePasswordUser2(pipes_struct *p,
  _samr_OemChangePasswordUser2
 ****************************************************************/
 
-NTSTATUS _samr_OemChangePasswordUser2(pipes_struct *p,
+NTSTATUS _samr_OemChangePasswordUser2(struct pipes_struct *p,
                                      struct samr_OemChangePasswordUser2 *r)
 {
-       struct smbd_server_connection *sconn = smbd_server_conn;
        NTSTATUS status;
        fstring user_name;
        const char *wks = NULL;
@@ -1982,7 +1987,7 @@ NTSTATUS _samr_OemChangePasswordUser2(pipes_struct *p,
         * function.
         */
 
-       (void)map_username(sconn, user_name);
+       (void)map_username(user_name);
 
        /*
         * UNIX username case mangling not required, pass_oem_change
@@ -2013,16 +2018,15 @@ NTSTATUS _samr_OemChangePasswordUser2(pipes_struct *p,
  _samr_ChangePasswordUser3
  ********************************************************************/
 
-NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
+NTSTATUS _samr_ChangePasswordUser3(struct pipes_struct *p,
                                   struct samr_ChangePasswordUser3 *r)
 {
-       struct smbd_server_connection *sconn = smbd_server_conn;
        NTSTATUS status;
        fstring user_name;
        const char *wks = NULL;
-       uint32 reject_reason;
+       enum samPwdChangeReason reject_reason;
        struct samr_DomInfo1 *dominfo = NULL;
-       struct samr_ChangeReject *reject = NULL;
+       struct userPwdChangeFailureInformation *reject = NULL;
        uint32_t tmp;
 
        DEBUG(5,("_samr_ChangePasswordUser3: %d\n", __LINE__));
@@ -2039,7 +2043,7 @@ NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
         * function.
         */
 
-       (void)map_username(sconn, user_name);
+       (void)map_username(user_name);
 
        /*
         * UNIX username case mangling not required, pass_oem_change
@@ -2067,7 +2071,8 @@ NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
                        return NT_STATUS_NO_MEMORY;
                }
 
-               reject = TALLOC_ZERO_P(p->mem_ctx, struct samr_ChangeReject);
+               reject = TALLOC_ZERO_P(p->mem_ctx,
+                               struct userPwdChangeFailureInformation);
                if (!reject) {
                        return NT_STATUS_NO_MEMORY;
                }
@@ -2076,19 +2081,19 @@ NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
 
                /* AS ROOT !!! */
 
-               pdb_get_account_policy(AP_MIN_PASSWORD_LEN, &tmp);
+               pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_LEN, &tmp);
                dominfo->min_password_length = tmp;
 
-               pdb_get_account_policy(AP_PASSWORD_HISTORY, &tmp);
+               pdb_get_account_policy(PDB_POLICY_PASSWORD_HISTORY, &tmp);
                dominfo->password_history_length = tmp;
 
-               pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
+               pdb_get_account_policy(PDB_POLICY_USER_MUST_LOGON_TO_CHG_PASS,
                                       &dominfo->password_properties);
 
-               pdb_get_account_policy(AP_MAX_PASSWORD_AGE, &account_policy_temp);
+               pdb_get_account_policy(PDB_POLICY_MAX_PASSWORD_AGE, &account_policy_temp);
                u_expire = account_policy_temp;
 
-               pdb_get_account_policy(AP_MIN_PASSWORD_AGE, &account_policy_temp);
+               pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_AGE, &account_policy_temp);
                u_min_age = account_policy_temp;
 
                /* !AS ROOT */
@@ -2102,7 +2107,7 @@ NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
                        dominfo->password_properties |= DOMAIN_PASSWORD_COMPLEX;
                }
 
-               reject->reason = reject_reason;
+               reject->extendedFailureReason = reject_reason;
 
                *r->out.dominfo = dominfo;
                *r->out.reject = reject;
@@ -2147,7 +2152,7 @@ static bool make_samr_lookup_rids(TALLOC_CTX *ctx, uint32 num_names,
  _samr_LookupRids
  ********************************************************************/
 
-NTSTATUS _samr_LookupRids(pipes_struct *p,
+NTSTATUS _samr_LookupRids(struct pipes_struct *p,
                          struct samr_LookupRids *r)
 {
        struct samr_domain_info *dinfo;
@@ -2226,14 +2231,14 @@ NTSTATUS _samr_LookupRids(pipes_struct *p,
  _samr_OpenUser
 ********************************************************************/
 
-NTSTATUS _samr_OpenUser(pipes_struct *p,
+NTSTATUS _samr_OpenUser(struct pipes_struct *p,
                        struct samr_OpenUser *r)
 {
        struct samu *sampass=NULL;
-       DOM_SID sid;
+       struct dom_sid sid;
        struct samr_domain_info *dinfo;
        struct samr_user_info *uinfo;
-       SEC_DESC *psd = NULL;
+       struct security_descriptor *psd = NULL;
        uint32    acc_granted;
        uint32    des_access = r->in.access_mask;
        uint32_t extra_access = 0;
@@ -2260,14 +2265,15 @@ NTSTATUS _samr_OpenUser(pipes_struct *p,
                return NT_STATUS_NO_SUCH_USER;
 
        /* check if access can be granted as requested by client. */
-
-       map_max_allowed_access(p->server_info->ptok, &des_access);
+       map_max_allowed_access(p->server_info->ptok,
+                              &p->server_info->utok,
+                              &des_access);
 
        make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &usr_generic_mapping, &sid, SAMR_USR_RIGHTS_WRITE_PW);
        se_map_generic(&des_access, &usr_generic_mapping);
 
        /*
-        * Get the sampass first as we need to check privilages
+        * Get the sampass first as we need to check privileges
         * based on what kind of user object this is.
         * But don't reveal info too early if it didn't exist.
         */
@@ -2313,13 +2319,13 @@ NTSTATUS _samr_OpenUser(pipes_struct *p,
                }
                /*
                 * Cheat - allow GENERIC_RIGHTS_USER_WRITE if pipe user is
-                * in DOMAIN_GROUP_RID_ADMINS. This is almost certainly not
+                * in DOMAIN_RID_ADMINS. This is almost certainly not
                 * what Windows does but is a hack for people who haven't
-                * set up privilages on groups in Samba.
+                * set up privileges on groups in Samba.
                 */
                if (acb_info & (ACB_SVRTRUST|ACB_DOMTRUST)) {
                        if (lp_enable_privileges() && nt_token_check_domain_rid(p->server_info->ptok,
-                                                       DOMAIN_GROUP_RID_ADMINS)) {
+                                                       DOMAIN_RID_ADMINS)) {
                                des_access &= ~GENERIC_RIGHTS_USER_WRITE;
                                extra_access = GENERIC_RIGHTS_USER_WRITE;
                                DEBUG(4,("_samr_OpenUser: Allowing "
@@ -2391,6 +2397,32 @@ static NTSTATUS init_samr_parameters_string(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
+/*************************************************************************
+ *************************************************************************/
+
+static struct samr_LogonHours get_logon_hours_from_pdb(TALLOC_CTX *mem_ctx,
+                                                      struct samu *pw)
+{
+       struct samr_LogonHours hours;
+       const int units_per_week = 168;
+
+       ZERO_STRUCT(hours);
+       hours.bits = talloc_array(mem_ctx, uint8_t, units_per_week);
+       if (!hours.bits) {
+               return hours;
+       }
+
+       hours.units_per_week = units_per_week;
+       memset(hours.bits, 0xFF, units_per_week);
+
+       if (pdb_get_hours(pw)) {
+               memcpy(hours.bits, pdb_get_hours(pw),
+                      MIN(pdb_get_hours_len(pw), units_per_week));
+       }
+
+       return hours;
+}
+
 /*************************************************************************
  get_user_info_1.
  *************************************************************************/
@@ -2398,9 +2430,9 @@ static NTSTATUS init_samr_parameters_string(TALLOC_CTX *mem_ctx,
 static NTSTATUS get_user_info_1(TALLOC_CTX *mem_ctx,
                                struct samr_UserInfo1 *r,
                                struct samu *pw,
-                               DOM_SID *domain_sid)
+                               struct dom_sid *domain_sid)
 {
-       const DOM_SID *sid_group;
+       const struct dom_sid *sid_group;
        uint32_t primary_gid;
 
        become_root();
@@ -2433,7 +2465,7 @@ static NTSTATUS get_user_info_2(TALLOC_CTX *mem_ctx,
                                struct samu *pw)
 {
        r->comment.string               = talloc_strdup(mem_ctx, pdb_get_comment(pw));
-       r->unknown.string               = NULL;
+       r->reserved.string              = NULL;
        r->country_code                 = 0;
        r->code_page                    = 0;
 
@@ -2447,9 +2479,9 @@ static NTSTATUS get_user_info_2(TALLOC_CTX *mem_ctx,
 static NTSTATUS get_user_info_3(TALLOC_CTX *mem_ctx,
                                struct samr_UserInfo3 *r,
                                struct samu *pw,
-                               DOM_SID *domain_sid)
+                               struct dom_sid *domain_sid)
 {
-       const DOM_SID *sid_user, *sid_group;
+       const struct dom_sid *sid_user, *sid_group;
        uint32_t rid, primary_gid;
 
        sid_user = pdb_get_user_sid(pw);
@@ -2518,9 +2550,9 @@ static NTSTATUS get_user_info_4(TALLOC_CTX *mem_ctx,
 static NTSTATUS get_user_info_5(TALLOC_CTX *mem_ctx,
                                struct samr_UserInfo5 *r,
                                struct samu *pw,
-                               DOM_SID *domain_sid)
+                               struct dom_sid *domain_sid)
 {
-       const DOM_SID *sid_user, *sid_group;
+       const struct dom_sid *sid_user, *sid_group;
        uint32_t rid, primary_gid;
 
        sid_user = pdb_get_user_sid(pw);
@@ -2723,24 +2755,33 @@ static NTSTATUS get_user_info_17(TALLOC_CTX *mem_ctx,
  user. JRA.
  *************************************************************************/
 
-static NTSTATUS get_user_info_18(pipes_struct *p,
+static NTSTATUS get_user_info_18(struct pipes_struct *p,
                                 TALLOC_CTX *mem_ctx,
                                 struct samr_UserInfo18 *r,
-                                DOM_SID *user_sid)
+                                struct dom_sid *user_sid)
 {
        struct samu *smbpass=NULL;
        bool ret;
+       const uint8_t *nt_pass = NULL;
+       const uint8_t *lm_pass = NULL;
 
        ZERO_STRUCTP(r);
 
-       if (p->auth.auth_type != PIPE_AUTH_TYPE_NTLMSSP || p->auth.auth_type != PIPE_AUTH_TYPE_SPNEGO_NTLMSSP) {
+       if (p->server_info->system) {
+               goto query;
+       }
+
+       if ((p->auth.auth_type != DCERPC_AUTH_TYPE_NTLMSSP) ||
+           ((p->auth.auth_type == DCERPC_AUTH_TYPE_SPNEGO) &&
+            (p->auth.spnego_type != PIPE_AUTH_TYPE_SPNEGO_NTLMSSP))) {
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       if (p->auth.auth_level != PIPE_AUTH_LEVEL_PRIVACY) {
+       if (p->auth.auth_level != DCERPC_AUTH_LEVEL_PRIVACY) {
                return NT_STATUS_ACCESS_DENIED;
        }
 
+ query:
        /*
         * Do *NOT* do become_root()/unbecome_root() here ! JRA.
         */
@@ -2764,10 +2805,17 @@ static NTSTATUS get_user_info_18(pipes_struct *p,
                return NT_STATUS_ACCOUNT_DISABLED;
        }
 
-       r->lm_pwd_active = true;
-       r->nt_pwd_active = true;
-       memcpy(r->lm_pwd.hash, pdb_get_lanman_passwd(smbpass), 16);
-       memcpy(r->nt_pwd.hash, pdb_get_nt_passwd(smbpass), 16);
+       lm_pass = pdb_get_lanman_passwd(smbpass);
+       if (lm_pass != NULL) {
+               memcpy(r->lm_pwd.hash, lm_pass, 16);
+               r->lm_pwd_active = true;
+       }
+
+       nt_pass = pdb_get_nt_passwd(smbpass);
+       if (nt_pass != NULL) {
+               memcpy(r->nt_pwd.hash, nt_pass, 16);
+               r->nt_pwd_active = true;
+       }
        r->password_expired = 0; /* FIXME */
 
        TALLOC_FREE(smbpass);
@@ -2820,11 +2868,11 @@ static NTSTATUS get_user_info_20(TALLOC_CTX *mem_ctx,
 static NTSTATUS get_user_info_21(TALLOC_CTX *mem_ctx,
                                 struct samr_UserInfo21 *r,
                                 struct samu *pw,
-                                DOM_SID *domain_sid,
+                                struct dom_sid *domain_sid,
                                 uint32_t acc_granted)
 {
        NTSTATUS status;
-       const DOM_SID *sid_user, *sid_group;
+       const struct dom_sid *sid_user, *sid_group;
        uint32_t rid, primary_gid;
        NTTIME force_password_change;
        time_t must_change_time;
@@ -2931,13 +2979,13 @@ static NTSTATUS get_user_info_21(TALLOC_CTX *mem_ctx,
  _samr_QueryUserInfo
  ********************************************************************/
 
-NTSTATUS _samr_QueryUserInfo(pipes_struct *p,
+NTSTATUS _samr_QueryUserInfo(struct pipes_struct *p,
                             struct samr_QueryUserInfo *r)
 {
        NTSTATUS status;
        union samr_UserInfo *user_info = NULL;
        struct samr_user_info *uinfo;
-       DOM_SID domain_sid;
+       struct dom_sid domain_sid;
        uint32 rid;
        bool ret = false;
        struct samu *pwd = NULL;
@@ -3133,7 +3181,7 @@ NTSTATUS _samr_QueryUserInfo(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_QueryUserInfo2(pipes_struct *p,
+NTSTATUS _samr_QueryUserInfo2(struct pipes_struct *p,
                              struct samr_QueryUserInfo2 *r)
 {
        struct samr_QueryUserInfo u;
@@ -3149,12 +3197,12 @@ NTSTATUS _samr_QueryUserInfo2(pipes_struct *p,
  _samr_GetGroupsForUser
  ********************************************************************/
 
-NTSTATUS _samr_GetGroupsForUser(pipes_struct *p,
+NTSTATUS _samr_GetGroupsForUser(struct pipes_struct *p,
                                struct samr_GetGroupsForUser *r)
 {
        struct samr_user_info *uinfo;
        struct samu *sam_pass=NULL;
-       DOM_SID *sids;
+       struct dom_sid *sids;
        struct samr_RidWithAttribute dom_gid;
        struct samr_RidWithAttribute *gids = NULL;
        uint32 primary_group_rid;
@@ -3275,309 +3323,418 @@ NTSTATUS _samr_GetGroupsForUser(pipes_struct *p,
 }
 
 /*******************************************************************
- _samr_QueryDomainInfo
  ********************************************************************/
 
-NTSTATUS _samr_QueryDomainInfo(pipes_struct *p,
-                              struct samr_QueryDomainInfo *r)
+static uint32_t samr_get_server_role(void)
 {
-       NTSTATUS status = NT_STATUS_OK;
-       struct samr_domain_info *dinfo;
-       union samr_DomainInfo *dom_info;
+       uint32_t role = ROLE_DOMAIN_PDC;
+
+       if (lp_server_role() == ROLE_DOMAIN_BDC) {
+               role = ROLE_DOMAIN_BDC;
+       }
+
+       return role;
+}
+
+/*******************************************************************
+ ********************************************************************/
+
+static NTSTATUS query_dom_info_1(TALLOC_CTX *mem_ctx,
+                                struct samr_DomInfo1 *r)
+{
+       uint32_t account_policy_temp;
        time_t u_expire, u_min_age;
 
-       time_t u_lock_duration, u_reset_time;
-       uint32_t u_logout;
+       become_root();
 
-       uint32 account_policy_temp;
+       /* AS ROOT !!! */
 
-       time_t seq_num;
-       uint32 server_role;
-       uint32_t acc_required;
+       pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_LEN, &account_policy_temp);
+       r->min_password_length = account_policy_temp;
 
-       DEBUG(5,("_samr_QueryDomainInfo: %d\n", __LINE__));
+       pdb_get_account_policy(PDB_POLICY_PASSWORD_HISTORY, &account_policy_temp);
+       r->password_history_length = account_policy_temp;
 
-       switch (r->in.level) {
-       case 1: /* DomainPasswordInformation */
-       case 12: /* DomainLockoutInformation */
-               /* DOMAIN_READ_PASSWORD_PARAMETERS */
-               acc_required = SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1;
-               break;
-       case 11: /* DomainGeneralInformation2 */
-               /* DOMAIN_READ_PASSWORD_PARAMETERS |
-                * DOMAIN_READ_OTHER_PARAMETERS */
-               acc_required = SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 |
-                              SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2;
-               break;
-       case 2: /* DomainGeneralInformation */
-       case 3: /* DomainLogoffInformation */
-       case 4: /* DomainOemInformation */
-       case 5: /* DomainReplicationInformation */
-       case 6: /* DomainReplicationInformation */
-       case 7: /* DomainServerRoleInformation */
-       case 8: /* DomainModifiedInformation */
-       case 9: /* DomainStateInformation */
-       case 10: /* DomainUasInformation */
-       case 13: /* DomainModifiedInformation2 */
-               /* DOMAIN_READ_OTHER_PARAMETERS */
-               acc_required = SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2;
-               break;
-       default:
-               return NT_STATUS_INVALID_INFO_CLASS;
-       }
+       pdb_get_account_policy(PDB_POLICY_USER_MUST_LOGON_TO_CHG_PASS,
+                              &r->password_properties);
 
-       dinfo = policy_handle_find(p, r->in.domain_handle,
-                                  acc_required, NULL,
-                                  struct samr_domain_info, &status);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
+       pdb_get_account_policy(PDB_POLICY_MAX_PASSWORD_AGE, &account_policy_temp);
+       u_expire = account_policy_temp;
+
+       pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_AGE, &account_policy_temp);
+       u_min_age = account_policy_temp;
+
+       /* !AS ROOT */
+
+       unbecome_root();
+
+       unix_to_nt_time_abs((NTTIME *)&r->max_password_age, u_expire);
+       unix_to_nt_time_abs((NTTIME *)&r->min_password_age, u_min_age);
+
+       if (lp_check_password_script() && *lp_check_password_script()) {
+               r->password_properties |= DOMAIN_PASSWORD_COMPLEX;
        }
 
-       dom_info = TALLOC_ZERO_P(p->mem_ctx, union samr_DomainInfo);
-       if (!dom_info) {
-               return NT_STATUS_NO_MEMORY;
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ ********************************************************************/
+
+static NTSTATUS query_dom_info_2(TALLOC_CTX *mem_ctx,
+                                struct samr_DomGeneralInformation *r,
+                                struct samr_domain_info *dinfo)
+{
+       uint32_t u_logout;
+       time_t seq_num;
+
+       become_root();
+
+       /* AS ROOT !!! */
+
+       r->num_users    = count_sam_users(dinfo->disp_info, ACB_NORMAL);
+       r->num_groups   = count_sam_groups(dinfo->disp_info);
+       r->num_aliases  = count_sam_aliases(dinfo->disp_info);
+
+       pdb_get_account_policy(PDB_POLICY_TIME_TO_LOGOUT, &u_logout);
+
+       unix_to_nt_time_abs(&r->force_logoff_time, u_logout);
+
+       if (!pdb_get_seq_num(&seq_num)) {
+               seq_num = time(NULL);
        }
 
-       switch (r->in.level) {
-               case 1:
+       /* !AS ROOT */
 
-                       become_root();
+       unbecome_root();
 
-                       /* AS ROOT !!! */
+       r->oem_information.string       = lp_serverstring();
+       r->domain_name.string           = lp_workgroup();
+       r->primary.string               = global_myname();
+       r->sequence_num                 = seq_num;
+       r->domain_server_state          = DOMAIN_SERVER_ENABLED;
+       r->role                         = samr_get_server_role();
+       r->unknown3                     = 1;
 
-                       pdb_get_account_policy(AP_MIN_PASSWORD_LEN,
-                                              &account_policy_temp);
-                       dom_info->info1.min_password_length = account_policy_temp;
+       return NT_STATUS_OK;
+}
 
-                       pdb_get_account_policy(AP_PASSWORD_HISTORY, &account_policy_temp);
-                       dom_info->info1.password_history_length = account_policy_temp;
+/*******************************************************************
+ ********************************************************************/
 
-                       pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
-                               &dom_info->info1.password_properties);
+static NTSTATUS query_dom_info_3(TALLOC_CTX *mem_ctx,
+                                struct samr_DomInfo3 *r)
+{
+       uint32_t u_logout;
 
-                       pdb_get_account_policy(AP_MAX_PASSWORD_AGE, &account_policy_temp);
-                       u_expire = account_policy_temp;
+       become_root();
 
-                       pdb_get_account_policy(AP_MIN_PASSWORD_AGE, &account_policy_temp);
-                       u_min_age = account_policy_temp;
+       /* AS ROOT !!! */
 
-                       /* !AS ROOT */
+       {
+               uint32_t ul;
+               pdb_get_account_policy(PDB_POLICY_TIME_TO_LOGOUT, &ul);
+               u_logout = (time_t)ul;
+       }
 
-                       unbecome_root();
+       /* !AS ROOT */
 
-                       unix_to_nt_time_abs((NTTIME *)&dom_info->info1.max_password_age, u_expire);
-                       unix_to_nt_time_abs((NTTIME *)&dom_info->info1.min_password_age, u_min_age);
+       unbecome_root();
 
-                       if (lp_check_password_script() && *lp_check_password_script()) {
-                               dom_info->info1.password_properties |= DOMAIN_PASSWORD_COMPLEX;
-                       }
+       unix_to_nt_time_abs(&r->force_logoff_time, u_logout);
 
-                       break;
-               case 2:
+       return NT_STATUS_OK;
+}
 
-                       become_root();
+/*******************************************************************
+ ********************************************************************/
 
-                       /* AS ROOT !!! */
+static NTSTATUS query_dom_info_4(TALLOC_CTX *mem_ctx,
+                                struct samr_DomOEMInformation *r)
+{
+       r->oem_information.string = lp_serverstring();
 
-                       dom_info->general.num_users     = count_sam_users(
-                               dinfo->disp_info, ACB_NORMAL);
-                       dom_info->general.num_groups    = count_sam_groups(
-                               dinfo->disp_info);
-                       dom_info->general.num_aliases   = count_sam_aliases(
-                               dinfo->disp_info);
+       return NT_STATUS_OK;
+}
 
-                       pdb_get_account_policy(AP_TIME_TO_LOGOUT, &u_logout);
+/*******************************************************************
+ ********************************************************************/
 
-                       unix_to_nt_time_abs(&dom_info->general.force_logoff_time, u_logout);
+static NTSTATUS query_dom_info_5(TALLOC_CTX *mem_ctx,
+                                struct samr_DomInfo5 *r)
+{
+       r->domain_name.string = get_global_sam_name();
 
-                       if (!pdb_get_seq_num(&seq_num))
-                               seq_num = time(NULL);
+       return NT_STATUS_OK;
+}
 
-                       /* !AS ROOT */
+/*******************************************************************
+ ********************************************************************/
 
-                       unbecome_root();
+static NTSTATUS query_dom_info_6(TALLOC_CTX *mem_ctx,
+                                struct samr_DomInfo6 *r)
+{
+       /* NT returns its own name when a PDC. win2k and later
+        * only the name of the PDC if itself is a BDC (samba4
+        * idl) */
+       r->primary.string = global_myname();
 
-                       server_role = ROLE_DOMAIN_PDC;
-                       if (lp_server_role() == ROLE_DOMAIN_BDC)
-                               server_role = ROLE_DOMAIN_BDC;
+       return NT_STATUS_OK;
+}
 
-                       dom_info->general.oem_information.string        = lp_serverstring();
-                       dom_info->general.domain_name.string            = lp_workgroup();
-                       dom_info->general.primary.string                = global_myname();
-                       dom_info->general.sequence_num                  = seq_num;
-                       dom_info->general.domain_server_state           = DOMAIN_SERVER_ENABLED;
-                       dom_info->general.role                          = server_role;
-                       dom_info->general.unknown3                      = 1;
+/*******************************************************************
+ ********************************************************************/
 
-                       break;
-               case 3:
+static NTSTATUS query_dom_info_7(TALLOC_CTX *mem_ctx,
+                                struct samr_DomInfo7 *r)
+{
+       r->role = samr_get_server_role();
 
-                       become_root();
+       return NT_STATUS_OK;
+}
 
-                       /* AS ROOT !!! */
+/*******************************************************************
+ ********************************************************************/
 
-                       {
-                               uint32 ul;
-                               pdb_get_account_policy(AP_TIME_TO_LOGOUT, &ul);
-                               u_logout = (time_t)ul;
-                       }
+static NTSTATUS query_dom_info_8(TALLOC_CTX *mem_ctx,
+                                struct samr_DomInfo8 *r)
+{
+       time_t seq_num;
 
-                       /* !AS ROOT */
+       become_root();
 
-                       unbecome_root();
+       /* AS ROOT !!! */
 
-                       unix_to_nt_time_abs(&dom_info->info3.force_logoff_time, u_logout);
+       if (!pdb_get_seq_num(&seq_num)) {
+               seq_num = time(NULL);
+       }
 
-                       break;
-               case 4:
-                       dom_info->oem.oem_information.string = lp_serverstring();
-                       break;
-               case 5:
-                       dom_info->info5.domain_name.string = get_global_sam_name();
-                       break;
-               case 6:
-                       /* NT returns its own name when a PDC. win2k and later
-                        * only the name of the PDC if itself is a BDC (samba4
-                        * idl) */
-                       dom_info->info6.primary.string = global_myname();
-                       break;
-               case 7:
-                       server_role = ROLE_DOMAIN_PDC;
-                       if (lp_server_role() == ROLE_DOMAIN_BDC)
-                               server_role = ROLE_DOMAIN_BDC;
+       /* !AS ROOT */
 
-                       dom_info->info7.role = server_role;
-                       break;
-               case 8:
+       unbecome_root();
 
-                       become_root();
+       r->sequence_num = seq_num;
+       r->domain_create_time = 0;
 
-                       /* AS ROOT !!! */
+       return NT_STATUS_OK;
+}
 
-                       if (!pdb_get_seq_num(&seq_num)) {
-                               seq_num = time(NULL);
-                       }
+/*******************************************************************
+ ********************************************************************/
 
-                       /* !AS ROOT */
+static NTSTATUS query_dom_info_9(TALLOC_CTX *mem_ctx,
+                                struct samr_DomInfo9 *r)
+{
+       r->domain_server_state = DOMAIN_SERVER_ENABLED;
 
-                       unbecome_root();
+       return NT_STATUS_OK;
+}
 
-                       dom_info->info8.sequence_num = seq_num;
-                       dom_info->info8.domain_create_time = 0;
+/*******************************************************************
+ ********************************************************************/
 
-                       break;
-               case 9:
+static NTSTATUS query_dom_info_11(TALLOC_CTX *mem_ctx,
+                                 struct samr_DomGeneralInformation2 *r,
+                                 struct samr_domain_info *dinfo)
+{
+       NTSTATUS status;
+       uint32_t account_policy_temp;
+       time_t u_lock_duration, u_reset_time;
 
-                       dom_info->info9.domain_server_state             = DOMAIN_SERVER_ENABLED;
+       status = query_dom_info_2(mem_ctx, &r->general, dinfo);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
-                       break;
-               case 11:
+       /* AS ROOT !!! */
 
-                       /* AS ROOT !!! */
+       become_root();
 
-                       become_root();
+       pdb_get_account_policy(PDB_POLICY_LOCK_ACCOUNT_DURATION, &account_policy_temp);
+       u_lock_duration = account_policy_temp;
+       if (u_lock_duration != -1) {
+               u_lock_duration *= 60;
+       }
 
-                       dom_info->general2.general.num_users    = count_sam_users(
-                               dinfo->disp_info, ACB_NORMAL);
-                       dom_info->general2.general.num_groups   = count_sam_groups(
-                               dinfo->disp_info);
-                       dom_info->general2.general.num_aliases  = count_sam_aliases(
-                               dinfo->disp_info);
+       pdb_get_account_policy(PDB_POLICY_RESET_COUNT_TIME, &account_policy_temp);
+       u_reset_time = account_policy_temp * 60;
 
-                       pdb_get_account_policy(AP_TIME_TO_LOGOUT, &u_logout);
+       pdb_get_account_policy(PDB_POLICY_BAD_ATTEMPT_LOCKOUT, &account_policy_temp);
+       r->lockout_threshold = account_policy_temp;
 
-                       unix_to_nt_time_abs(&dom_info->general2.general.force_logoff_time, u_logout);
+       /* !AS ROOT */
 
-                       if (!pdb_get_seq_num(&seq_num))
-                               seq_num = time(NULL);
+       unbecome_root();
 
-                       pdb_get_account_policy(AP_LOCK_ACCOUNT_DURATION, &account_policy_temp);
-                       u_lock_duration = account_policy_temp;
-                       if (u_lock_duration != -1) {
-                               u_lock_duration *= 60;
-                       }
+       unix_to_nt_time_abs(&r->lockout_duration, u_lock_duration);
+       unix_to_nt_time_abs(&r->lockout_window, u_reset_time);
 
-                       pdb_get_account_policy(AP_RESET_COUNT_TIME, &account_policy_temp);
-                       u_reset_time = account_policy_temp * 60;
+       return NT_STATUS_OK;
+}
 
-                       pdb_get_account_policy(AP_BAD_ATTEMPT_LOCKOUT,
-                                              &account_policy_temp);
-                       dom_info->general2.lockout_threshold = account_policy_temp;
+/*******************************************************************
+ ********************************************************************/
 
-                       /* !AS ROOT */
+static NTSTATUS query_dom_info_12(TALLOC_CTX *mem_ctx,
+                                 struct samr_DomInfo12 *r)
+{
+       uint32_t account_policy_temp;
+       time_t u_lock_duration, u_reset_time;
 
-                       unbecome_root();
+       become_root();
 
-                       server_role = ROLE_DOMAIN_PDC;
-                       if (lp_server_role() == ROLE_DOMAIN_BDC)
-                               server_role = ROLE_DOMAIN_BDC;
+       /* AS ROOT !!! */
 
-                       dom_info->general2.general.oem_information.string       = lp_serverstring();
-                       dom_info->general2.general.domain_name.string           = lp_workgroup();
-                       dom_info->general2.general.primary.string               = global_myname();
-                       dom_info->general2.general.sequence_num                 = seq_num;
-                       dom_info->general2.general.domain_server_state          = DOMAIN_SERVER_ENABLED;
-                       dom_info->general2.general.role                         = server_role;
-                       dom_info->general2.general.unknown3                     = 1;
+       pdb_get_account_policy(PDB_POLICY_LOCK_ACCOUNT_DURATION, &account_policy_temp);
+       u_lock_duration = account_policy_temp;
+       if (u_lock_duration != -1) {
+               u_lock_duration *= 60;
+       }
 
-                       unix_to_nt_time_abs(&dom_info->general2.lockout_duration,
-                                           u_lock_duration);
-                       unix_to_nt_time_abs(&dom_info->general2.lockout_window,
-                                           u_reset_time);
+       pdb_get_account_policy(PDB_POLICY_RESET_COUNT_TIME, &account_policy_temp);
+       u_reset_time = account_policy_temp * 60;
 
-                       break;
-               case 12:
+       pdb_get_account_policy(PDB_POLICY_BAD_ATTEMPT_LOCKOUT, &account_policy_temp);
+       r->lockout_threshold = account_policy_temp;
 
-                       become_root();
+       /* !AS ROOT */
 
-                       /* AS ROOT !!! */
+       unbecome_root();
 
-                       pdb_get_account_policy(AP_LOCK_ACCOUNT_DURATION, &account_policy_temp);
-                       u_lock_duration = account_policy_temp;
-                       if (u_lock_duration != -1) {
-                               u_lock_duration *= 60;
-                       }
+       unix_to_nt_time_abs(&r->lockout_duration, u_lock_duration);
+       unix_to_nt_time_abs(&r->lockout_window, u_reset_time);
 
-                       pdb_get_account_policy(AP_RESET_COUNT_TIME, &account_policy_temp);
-                       u_reset_time = account_policy_temp * 60;
+       return NT_STATUS_OK;
+}
 
-                       pdb_get_account_policy(AP_BAD_ATTEMPT_LOCKOUT,
-                                              &account_policy_temp);
-                       dom_info->info12.lockout_threshold = account_policy_temp;
+/*******************************************************************
+ ********************************************************************/
 
-                       /* !AS ROOT */
+static NTSTATUS query_dom_info_13(TALLOC_CTX *mem_ctx,
+                                 struct samr_DomInfo13 *r)
+{
+       time_t seq_num;
 
-                       unbecome_root();
+       become_root();
 
-                       unix_to_nt_time_abs(&dom_info->info12.lockout_duration,
-                                           u_lock_duration);
-                       unix_to_nt_time_abs(&dom_info->info12.lockout_window,
-                                           u_reset_time);
+       /* AS ROOT !!! */
 
-                       break;
-               case 13:
+       if (!pdb_get_seq_num(&seq_num)) {
+               seq_num = time(NULL);
+       }
 
-                       become_root();
+       /* !AS ROOT */
 
-                       /* AS ROOT !!! */
+       unbecome_root();
 
-                       if (!pdb_get_seq_num(&seq_num)) {
-                               seq_num = time(NULL);
-                       }
+       r->sequence_num = seq_num;
+       r->domain_create_time = 0;
+       r->modified_count_at_last_promotion = 0;
 
-                       /* !AS ROOT */
+       return NT_STATUS_OK;
+}
 
-                       unbecome_root();
+/*******************************************************************
+ _samr_QueryDomainInfo
+ ********************************************************************/
+
+NTSTATUS _samr_QueryDomainInfo(struct pipes_struct *p,
+                              struct samr_QueryDomainInfo *r)
+{
+       NTSTATUS status = NT_STATUS_OK;
+       struct samr_domain_info *dinfo;
+       union samr_DomainInfo *dom_info;
+
+       uint32_t acc_required;
+
+       DEBUG(5,("_samr_QueryDomainInfo: %d\n", __LINE__));
+
+       switch (r->in.level) {
+       case 1: /* DomainPasswordInformation */
+       case 12: /* DomainLockoutInformation */
+               /* DOMAIN_READ_PASSWORD_PARAMETERS */
+               acc_required = SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1;
+               break;
+       case 11: /* DomainGeneralInformation2 */
+               /* DOMAIN_READ_PASSWORD_PARAMETERS |
+                * DOMAIN_READ_OTHER_PARAMETERS */
+               acc_required = SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 |
+                              SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2;
+               break;
+       case 2: /* DomainGeneralInformation */
+       case 3: /* DomainLogoffInformation */
+       case 4: /* DomainOemInformation */
+       case 5: /* DomainReplicationInformation */
+       case 6: /* DomainReplicationInformation */
+       case 7: /* DomainServerRoleInformation */
+       case 8: /* DomainModifiedInformation */
+       case 9: /* DomainStateInformation */
+       case 10: /* DomainUasInformation */
+       case 13: /* DomainModifiedInformation2 */
+               /* DOMAIN_READ_OTHER_PARAMETERS */
+               acc_required = SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2;
+               break;
+       default:
+               return NT_STATUS_INVALID_INFO_CLASS;
+       }
 
-                       dom_info->info13.sequence_num = seq_num;
-                       dom_info->info13.domain_create_time = 0;
-                       dom_info->info13.modified_count_at_last_promotion = 0;
+       dinfo = policy_handle_find(p, r->in.domain_handle,
+                                  acc_required, NULL,
+                                  struct samr_domain_info, &status);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       dom_info = TALLOC_ZERO_P(p->mem_ctx, union samr_DomainInfo);
+       if (!dom_info) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
+       switch (r->in.level) {
+               case 1:
+                       status = query_dom_info_1(p->mem_ctx, &dom_info->info1);
+                       break;
+               case 2:
+                       status = query_dom_info_2(p->mem_ctx, &dom_info->general, dinfo);
+                       break;
+               case 3:
+                       status = query_dom_info_3(p->mem_ctx, &dom_info->info3);
+                       break;
+               case 4:
+                       status = query_dom_info_4(p->mem_ctx, &dom_info->oem);
+                       break;
+               case 5:
+                       status = query_dom_info_5(p->mem_ctx, &dom_info->info5);
+                       break;
+               case 6:
+                       status = query_dom_info_6(p->mem_ctx, &dom_info->info6);
+                       break;
+               case 7:
+                       status = query_dom_info_7(p->mem_ctx, &dom_info->info7);
+                       break;
+               case 8:
+                       status = query_dom_info_8(p->mem_ctx, &dom_info->info8);
+                       break;
+               case 9:
+                       status = query_dom_info_9(p->mem_ctx, &dom_info->info9);
+                       break;
+               case 11:
+                       status = query_dom_info_11(p->mem_ctx, &dom_info->general2, dinfo);
+                       break;
+               case 12:
+                       status = query_dom_info_12(p->mem_ctx, &dom_info->info12);
+                       break;
+               case 13:
+                       status = query_dom_info_13(p->mem_ctx, &dom_info->info13);
                        break;
                default:
                        return NT_STATUS_INVALID_INFO_CLASS;
        }
 
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
        *r->out.info = dom_info;
 
        DEBUG(5,("_samr_QueryDomainInfo: %d\n", __LINE__));
@@ -3627,17 +3784,17 @@ static NTSTATUS can_create(TALLOC_CTX *mem_ctx, const char *new_name)
  _samr_CreateUser2
  ********************************************************************/
 
-NTSTATUS _samr_CreateUser2(pipes_struct *p,
+NTSTATUS _samr_CreateUser2(struct pipes_struct *p,
                           struct samr_CreateUser2 *r)
 {
        const char *account = NULL;
-       DOM_SID sid;
+       struct dom_sid sid;
        uint32_t acb_info = r->in.acct_flags;
        struct samr_domain_info *dinfo;
        struct samr_user_info *uinfo;
        NTSTATUS nt_status;
        uint32 acc_granted;
-       SEC_DESC *psd;
+       struct security_descriptor *psd;
        size_t    sd_size;
        /* check this, when giving away 'add computer to domain' privs */
        uint32    des_access = GENERIC_RIGHTS_USER_ALL_ACCESS;
@@ -3696,7 +3853,7 @@ NTSTATUS _samr_CreateUser2(pipes_struct *p,
                se_priv_copy(&se_rights, &se_priv_none);
                can_add_account = nt_token_check_domain_rid(
                        p->server_info->ptok,
-                       DOMAIN_GROUP_RID_ADMINS );
+                       DOMAIN_RID_ADMINS );
        }
 
        DEBUG(5, ("_samr_CreateUser2: %s can add this account : %s\n",
@@ -3725,7 +3882,9 @@ NTSTATUS _samr_CreateUser2(pipes_struct *p,
 
        sid_compose(&sid, get_global_sam_sid(), *r->out.rid);
 
-       map_max_allowed_access(p->server_info->ptok, &des_access);
+       map_max_allowed_access(p->server_info->ptok,
+                              &p->server_info->utok,
+                              &des_access);
 
        make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &usr_generic_mapping,
                            &sid, SAMR_USR_RIGHTS_WRITE_PW);
@@ -3764,7 +3923,7 @@ NTSTATUS _samr_CreateUser2(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_CreateUser(pipes_struct *p,
+NTSTATUS _samr_CreateUser(struct pipes_struct *p,
                          struct samr_CreateUser *r)
 {
        struct samr_CreateUser2 c;
@@ -3785,7 +3944,7 @@ NTSTATUS _samr_CreateUser(pipes_struct *p,
  _samr_Connect
  ********************************************************************/
 
-NTSTATUS _samr_Connect(pipes_struct *p,
+NTSTATUS _samr_Connect(struct pipes_struct *p,
                       struct samr_Connect *r)
 {
        struct samr_connect_info *info;
@@ -3805,7 +3964,9 @@ NTSTATUS _samr_Connect(pipes_struct *p,
           was observed from a win98 client trying to enumerate users (when configured
           user level access control on shares)   --jerry */
 
-       map_max_allowed_access(p->server_info->ptok, &des_access);
+       map_max_allowed_access(p->server_info->ptok,
+                              &p->server_info->utok,
+                              &des_access);
 
        se_map_generic( &des_access, &sam_generic_mapping );
 
@@ -3829,19 +3990,19 @@ NTSTATUS _samr_Connect(pipes_struct *p,
  _samr_Connect2
  ********************************************************************/
 
-NTSTATUS _samr_Connect2(pipes_struct *p,
+NTSTATUS _samr_Connect2(struct pipes_struct *p,
                        struct samr_Connect2 *r)
 {
        struct samr_connect_info *info = NULL;
        struct policy_handle hnd;
-       SEC_DESC *psd = NULL;
+       struct security_descriptor *psd = NULL;
        uint32    acc_granted;
        uint32    des_access = r->in.access_mask;
        NTSTATUS  nt_status;
        size_t    sd_size;
        const char *fn = "_samr_Connect2";
 
-       switch (p->hdr_req.opnum) {
+       switch (p->opnum) {
        case NDR_SAMR_CONNECT2:
                fn = "_samr_Connect2";
                break;
@@ -3865,7 +4026,9 @@ NTSTATUS _samr_Connect2(pipes_struct *p,
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       map_max_allowed_access(p->server_info->ptok, &des_access);
+       map_max_allowed_access(p->server_info->ptok,
+                              &p->server_info->utok,
+                              &des_access);
 
        make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &sam_generic_mapping, NULL, 0);
        se_map_generic(&des_access, &sam_generic_mapping);
@@ -3892,7 +4055,7 @@ NTSTATUS _samr_Connect2(pipes_struct *p,
  _samr_Connect3
 ****************************************************************/
 
-NTSTATUS _samr_Connect3(pipes_struct *p,
+NTSTATUS _samr_Connect3(struct pipes_struct *p,
                        struct samr_Connect3 *r)
 {
        struct samr_Connect2 c;
@@ -3908,7 +4071,7 @@ NTSTATUS _samr_Connect3(pipes_struct *p,
  _samr_Connect4
  ********************************************************************/
 
-NTSTATUS _samr_Connect4(pipes_struct *p,
+NTSTATUS _samr_Connect4(struct pipes_struct *p,
                        struct samr_Connect4 *r)
 {
        struct samr_Connect2 c;
@@ -3924,7 +4087,7 @@ NTSTATUS _samr_Connect4(pipes_struct *p,
  _samr_Connect5
  ********************************************************************/
 
-NTSTATUS _samr_Connect5(pipes_struct *p,
+NTSTATUS _samr_Connect5(struct pipes_struct *p,
                        struct samr_Connect5 *r)
 {
        NTSTATUS status;
@@ -3954,13 +4117,13 @@ NTSTATUS _samr_Connect5(pipes_struct *p,
  _samr_LookupDomain
  **********************************************************************/
 
-NTSTATUS _samr_LookupDomain(pipes_struct *p,
+NTSTATUS _samr_LookupDomain(struct pipes_struct *p,
                            struct samr_LookupDomain *r)
 {
        NTSTATUS status;
        struct samr_connect_info *info;
        const char *domain_name;
-       DOM_SID *sid = NULL;
+       struct dom_sid *sid = NULL;
 
        /* win9x user manager likes to use SAMR_ACCESS_ENUM_DOMAINS here.
           Reverted that change so we will work with RAS servers again */
@@ -4003,7 +4166,7 @@ NTSTATUS _samr_LookupDomain(pipes_struct *p,
  _samr_EnumDomains
  **********************************************************************/
 
-NTSTATUS _samr_EnumDomains(pipes_struct *p,
+NTSTATUS _samr_EnumDomains(struct pipes_struct *p,
                           struct samr_EnumDomains *r)
 {
        NTSTATUS status;
@@ -4050,14 +4213,14 @@ NTSTATUS _samr_EnumDomains(pipes_struct *p,
  _samr_OpenAlias
  ********************************************************************/
 
-NTSTATUS _samr_OpenAlias(pipes_struct *p,
+NTSTATUS _samr_OpenAlias(struct pipes_struct *p,
                         struct samr_OpenAlias *r)
 {
-       DOM_SID sid;
+       struct dom_sid sid;
        uint32 alias_rid = r->in.rid;
        struct samr_alias_info *ainfo;
        struct samr_domain_info *dinfo;
-       SEC_DESC *psd = NULL;
+       struct security_descriptor *psd = NULL;
        uint32    acc_granted;
        uint32    des_access = r->in.access_mask;
        size_t    sd_size;
@@ -4078,7 +4241,9 @@ NTSTATUS _samr_OpenAlias(pipes_struct *p,
 
        /*check if access can be granted as requested by client. */
 
-       map_max_allowed_access(p->server_info->ptok, &des_access);
+       map_max_allowed_access(p->server_info->ptok,
+                              &p->server_info->utok,
+                              &des_access);
 
        make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &ali_generic_mapping, NULL, 0);
        se_map_generic(&des_access,&ali_generic_mapping);
@@ -4912,7 +5077,7 @@ static uint32_t samr_set_user_info_map_fields_to_access_mask(uint32_t fields)
  samr_SetUserInfo
  ********************************************************************/
 
-NTSTATUS _samr_SetUserInfo(pipes_struct *p,
+NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
                           struct samr_SetUserInfo *r)
 {
        struct samr_user_info *uinfo;
@@ -5168,7 +5333,7 @@ NTSTATUS _samr_SetUserInfo(pipes_struct *p,
  _samr_SetUserInfo2
  ********************************************************************/
 
-NTSTATUS _samr_SetUserInfo2(pipes_struct *p,
+NTSTATUS _samr_SetUserInfo2(struct pipes_struct *p,
                            struct samr_SetUserInfo2 *r)
 {
        struct samr_SetUserInfo q;
@@ -5184,7 +5349,7 @@ NTSTATUS _samr_SetUserInfo2(pipes_struct *p,
  _samr_GetAliasMembership
 *********************************************************************/
 
-NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
+NTSTATUS _samr_GetAliasMembership(struct pipes_struct *p,
                                  struct samr_GetAliasMembership *r)
 {
        size_t num_alias_rids;
@@ -5194,7 +5359,7 @@ NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
 
        NTSTATUS status;
 
-       DOM_SID *members;
+       struct dom_sid *members;
 
        DEBUG(5,("_samr_GetAliasMembership: %d\n", __LINE__));
 
@@ -5211,7 +5376,7 @@ NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
                return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
        if (r->in.sids->num_sids) {
-               members = TALLOC_ARRAY(p->mem_ctx, DOM_SID, r->in.sids->num_sids);
+               members = TALLOC_ARRAY(p->mem_ctx, struct dom_sid, r->in.sids->num_sids);
 
                if (members == NULL)
                        return NT_STATUS_NO_MEMORY;
@@ -5238,6 +5403,14 @@ NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
        r->out.rids->count = num_alias_rids;
        r->out.rids->ids = alias_rids;
 
+       if (r->out.rids->ids == NULL) {
+               /* Windows domain clients don't accept a NULL ptr here */
+               r->out.rids->ids = talloc_zero(p->mem_ctx, uint32_t);
+       }
+       if (r->out.rids->ids == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
        return NT_STATUS_OK;
 }
 
@@ -5245,7 +5418,7 @@ NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
  _samr_GetMembersInAlias
 *********************************************************************/
 
-NTSTATUS _samr_GetMembersInAlias(pipes_struct *p,
+NTSTATUS _samr_GetMembersInAlias(struct pipes_struct *p,
                                 struct samr_GetMembersInAlias *r)
 {
        struct samr_alias_info *ainfo;
@@ -5253,7 +5426,7 @@ NTSTATUS _samr_GetMembersInAlias(pipes_struct *p,
        size_t i;
        size_t num_sids = 0;
        struct lsa_SidPtr *sids = NULL;
-       DOM_SID *pdb_sids = NULL;
+       struct dom_sid *pdb_sids = NULL;
 
        ainfo = policy_handle_find(p, r->in.alias_handle,
                                   SAMR_ALIAS_ACCESS_GET_MEMBERS, NULL,
@@ -5301,7 +5474,7 @@ NTSTATUS _samr_GetMembersInAlias(pipes_struct *p,
  _samr_QueryGroupMember
 *********************************************************************/
 
-NTSTATUS _samr_QueryGroupMember(pipes_struct *p,
+NTSTATUS _samr_QueryGroupMember(struct pipes_struct *p,
                                struct samr_QueryGroupMember *r)
 {
        struct samr_group_info *ginfo;
@@ -5368,7 +5541,7 @@ NTSTATUS _samr_QueryGroupMember(pipes_struct *p,
  _samr_AddAliasMember
 *********************************************************************/
 
-NTSTATUS _samr_AddAliasMember(pipes_struct *p,
+NTSTATUS _samr_AddAliasMember(struct pipes_struct *p,
                              struct samr_AddAliasMember *r)
 {
        struct samr_alias_info *ainfo;
@@ -5402,7 +5575,7 @@ NTSTATUS _samr_AddAliasMember(pipes_struct *p,
  _samr_DeleteAliasMember
 *********************************************************************/
 
-NTSTATUS _samr_DeleteAliasMember(pipes_struct *p,
+NTSTATUS _samr_DeleteAliasMember(struct pipes_struct *p,
                                 struct samr_DeleteAliasMember *r)
 {
        struct samr_alias_info *ainfo;
@@ -5437,7 +5610,7 @@ NTSTATUS _samr_DeleteAliasMember(pipes_struct *p,
  _samr_AddGroupMember
 *********************************************************************/
 
-NTSTATUS _samr_AddGroupMember(pipes_struct *p,
+NTSTATUS _samr_AddGroupMember(struct pipes_struct *p,
                              struct samr_AddGroupMember *r)
 {
        struct samr_group_info *ginfo;
@@ -5475,7 +5648,7 @@ NTSTATUS _samr_AddGroupMember(pipes_struct *p,
  _samr_DeleteGroupMember
 *********************************************************************/
 
-NTSTATUS _samr_DeleteGroupMember(pipes_struct *p,
+NTSTATUS _samr_DeleteGroupMember(struct pipes_struct *p,
                                 struct samr_DeleteGroupMember *r)
 
 {
@@ -5518,7 +5691,7 @@ NTSTATUS _samr_DeleteGroupMember(pipes_struct *p,
  _samr_DeleteUser
 *********************************************************************/
 
-NTSTATUS _samr_DeleteUser(pipes_struct *p,
+NTSTATUS _samr_DeleteUser(struct pipes_struct *p,
                          struct samr_DeleteUser *r)
 {
        struct samr_user_info *uinfo;
@@ -5529,7 +5702,7 @@ NTSTATUS _samr_DeleteUser(pipes_struct *p,
        DEBUG(5, ("_samr_DeleteUser: %d\n", __LINE__));
 
        uinfo = policy_handle_find(p, r->in.user_handle,
-                                  STD_RIGHT_DELETE_ACCESS, NULL,
+                                  SEC_STD_DELETE, NULL,
                                   struct samr_user_info, &status);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
@@ -5573,13 +5746,13 @@ NTSTATUS _samr_DeleteUser(pipes_struct *p,
 
        TALLOC_FREE(sam_pass);
 
+       force_flush_samr_cache(&uinfo->sid);
+
        if (!close_policy_hnd(p, r->in.user_handle))
                return NT_STATUS_OBJECT_NAME_INVALID;
 
        ZERO_STRUCTP(r->out.user_handle);
 
-       force_flush_samr_cache(&uinfo->sid);
-
        return NT_STATUS_OK;
 }
 
@@ -5587,7 +5760,7 @@ NTSTATUS _samr_DeleteUser(pipes_struct *p,
  _samr_DeleteDomainGroup
 *********************************************************************/
 
-NTSTATUS _samr_DeleteDomainGroup(pipes_struct *p,
+NTSTATUS _samr_DeleteDomainGroup(struct pipes_struct *p,
                                 struct samr_DeleteDomainGroup *r)
 {
        struct samr_group_info *ginfo;
@@ -5597,7 +5770,7 @@ NTSTATUS _samr_DeleteDomainGroup(pipes_struct *p,
        DEBUG(5, ("samr_DeleteDomainGroup: %d\n", __LINE__));
 
        ginfo = policy_handle_find(p, r->in.group_handle,
-                                  STD_RIGHT_DELETE_ACCESS, NULL,
+                                  SEC_STD_DELETE, NULL,
                                   struct samr_group_info, &status);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
@@ -5626,11 +5799,11 @@ NTSTATUS _samr_DeleteDomainGroup(pipes_struct *p,
                return status;
        }
 
+       force_flush_samr_cache(&ginfo->sid);
+
        if (!close_policy_hnd(p, r->in.group_handle))
                return NT_STATUS_OBJECT_NAME_INVALID;
 
-       force_flush_samr_cache(&ginfo->sid);
-
        return NT_STATUS_OK;
 }
 
@@ -5638,7 +5811,7 @@ NTSTATUS _samr_DeleteDomainGroup(pipes_struct *p,
  _samr_DeleteDomAlias
 *********************************************************************/
 
-NTSTATUS _samr_DeleteDomAlias(pipes_struct *p,
+NTSTATUS _samr_DeleteDomAlias(struct pipes_struct *p,
                              struct samr_DeleteDomAlias *r)
 {
        struct samr_alias_info *ainfo;
@@ -5647,7 +5820,7 @@ NTSTATUS _samr_DeleteDomAlias(pipes_struct *p,
        DEBUG(5, ("_samr_DeleteDomAlias: %d\n", __LINE__));
 
        ainfo = policy_handle_find(p, r->in.alias_handle,
-                                  STD_RIGHT_DELETE_ACCESS, NULL,
+                                  SEC_STD_DELETE, NULL,
                                   struct samr_alias_info, &status);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
@@ -5678,11 +5851,11 @@ NTSTATUS _samr_DeleteDomAlias(pipes_struct *p,
        if ( !NT_STATUS_IS_OK(status))
                return status;
 
+       force_flush_samr_cache(&ainfo->sid);
+
        if (!close_policy_hnd(p, r->in.alias_handle))
                return NT_STATUS_OBJECT_NAME_INVALID;
 
-       force_flush_samr_cache(&ainfo->sid);
-
        return NT_STATUS_OK;
 }
 
@@ -5690,7 +5863,7 @@ NTSTATUS _samr_DeleteDomAlias(pipes_struct *p,
  _samr_CreateDomainGroup
 *********************************************************************/
 
-NTSTATUS _samr_CreateDomainGroup(pipes_struct *p,
+NTSTATUS _samr_CreateDomainGroup(struct pipes_struct *p,
                                 struct samr_CreateDomainGroup *r)
 
 {
@@ -5706,8 +5879,9 @@ NTSTATUS _samr_CreateDomainGroup(pipes_struct *p,
                return status;
        }
 
-       if (!sid_equal(&dinfo->sid, get_global_sam_sid()))
+       if (!sid_check_is_domain(&dinfo->sid)) {
                return NT_STATUS_ACCESS_DENIED;
+       }
 
        name = r->in.name->string;
        if (name == NULL) {
@@ -5750,10 +5924,10 @@ NTSTATUS _samr_CreateDomainGroup(pipes_struct *p,
  _samr_CreateDomAlias
 *********************************************************************/
 
-NTSTATUS _samr_CreateDomAlias(pipes_struct *p,
+NTSTATUS _samr_CreateDomAlias(struct pipes_struct *p,
                              struct samr_CreateDomAlias *r)
 {
-       DOM_SID info_sid;
+       struct dom_sid info_sid;
        const char *name = NULL;
        struct samr_domain_info *dinfo;
        struct samr_alias_info *ainfo;
@@ -5767,8 +5941,9 @@ NTSTATUS _samr_CreateDomAlias(pipes_struct *p,
                return result;
        }
 
-       if (!sid_equal(&dinfo->sid, get_global_sam_sid()))
+       if (!sid_check_is_domain(&dinfo->sid)) {
                return NT_STATUS_ACCESS_DENIED;
+       }
 
        name = r->in.alias_name->string;
 
@@ -5823,7 +5998,7 @@ NTSTATUS _samr_CreateDomAlias(pipes_struct *p,
  _samr_QueryGroupInfo
 *********************************************************************/
 
-NTSTATUS _samr_QueryGroupInfo(pipes_struct *p,
+NTSTATUS _samr_QueryGroupInfo(struct pipes_struct *p,
                              struct samr_QueryGroupInfo *r)
 {
        struct samr_group_info *ginfo;
@@ -5926,7 +6101,7 @@ NTSTATUS _samr_QueryGroupInfo(pipes_struct *p,
  _samr_SetGroupInfo
 *********************************************************************/
 
-NTSTATUS _samr_SetGroupInfo(pipes_struct *p,
+NTSTATUS _samr_SetGroupInfo(struct pipes_struct *p,
                            struct samr_SetGroupInfo *r)
 {
        struct samr_group_info *ginfo;
@@ -5979,7 +6154,7 @@ NTSTATUS _samr_SetGroupInfo(pipes_struct *p,
  _samr_SetAliasInfo
 *********************************************************************/
 
-NTSTATUS _samr_SetAliasInfo(pipes_struct *p,
+NTSTATUS _samr_SetAliasInfo(struct pipes_struct *p,
                            struct samr_SetAliasInfo *r)
 {
        struct samr_alias_info *ainfo;
@@ -6068,7 +6243,7 @@ NTSTATUS _samr_SetAliasInfo(pipes_struct *p,
  _samr_GetDomPwInfo
 ****************************************************************/
 
-NTSTATUS _samr_GetDomPwInfo(pipes_struct *p,
+NTSTATUS _samr_GetDomPwInfo(struct pipes_struct *p,
                            struct samr_GetDomPwInfo *r)
 {
        uint32_t min_password_length = 0;
@@ -6084,9 +6259,9 @@ NTSTATUS _samr_GetDomPwInfo(pipes_struct *p,
        }
 
        become_root();
-       pdb_get_account_policy(AP_MIN_PASSWORD_LEN,
+       pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_LEN,
                               &min_password_length);
-       pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
+       pdb_get_account_policy(PDB_POLICY_USER_MUST_LOGON_TO_CHG_PASS,
                               &password_properties);
        unbecome_root();
 
@@ -6104,15 +6279,15 @@ NTSTATUS _samr_GetDomPwInfo(pipes_struct *p,
  _samr_OpenGroup
 *********************************************************************/
 
-NTSTATUS _samr_OpenGroup(pipes_struct *p,
+NTSTATUS _samr_OpenGroup(struct pipes_struct *p,
                         struct samr_OpenGroup *r)
 
 {
-       DOM_SID info_sid;
+       struct dom_sid info_sid;
        GROUP_MAP map;
        struct samr_domain_info *dinfo;
        struct samr_group_info *ginfo;
-       SEC_DESC         *psd = NULL;
+       struct security_descriptor         *psd = NULL;
        uint32            acc_granted;
        uint32            des_access = r->in.access_mask;
        size_t            sd_size;
@@ -6128,7 +6303,9 @@ NTSTATUS _samr_OpenGroup(pipes_struct *p,
        }
 
        /*check if access can be granted as requested by client. */
-       map_max_allowed_access(p->server_info->ptok, &des_access);
+       map_max_allowed_access(p->server_info->ptok,
+                              &p->server_info->utok,
+                              &des_access);
 
        make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &grp_generic_mapping, NULL, 0);
        se_map_generic(&des_access,&grp_generic_mapping);
@@ -6144,8 +6321,9 @@ NTSTATUS _samr_OpenGroup(pipes_struct *p,
 
        /* this should not be hard-coded like this */
 
-       if (!sid_equal(&dinfo->sid, get_global_sam_sid()))
+       if (!sid_check_is_domain(&dinfo->sid)) {
                return NT_STATUS_ACCESS_DENIED;
+       }
 
        sid_compose(&info_sid, &dinfo->sid, r->in.rid);
 
@@ -6174,7 +6352,7 @@ NTSTATUS _samr_OpenGroup(pipes_struct *p,
  _samr_RemoveMemberFromForeignDomain
 *********************************************************************/
 
-NTSTATUS _samr_RemoveMemberFromForeignDomain(pipes_struct *p,
+NTSTATUS _samr_RemoveMemberFromForeignDomain(struct pipes_struct *p,
                                             struct samr_RemoveMemberFromForeignDomain *r)
 {
        struct samr_domain_info *dinfo;
@@ -6229,7 +6407,7 @@ NTSTATUS _samr_RemoveMemberFromForeignDomain(pipes_struct *p,
  _samr_QueryDomainInfo2
  ********************************************************************/
 
-NTSTATUS _samr_QueryDomainInfo2(pipes_struct *p,
+NTSTATUS _samr_QueryDomainInfo2(struct pipes_struct *p,
                                struct samr_QueryDomainInfo2 *r)
 {
        struct samr_QueryDomainInfo q;
@@ -6243,17 +6421,75 @@ NTSTATUS _samr_QueryDomainInfo2(pipes_struct *p,
 }
 
 /*******************************************************************
- _samr_SetDomainInfo
  ********************************************************************/
 
-NTSTATUS _samr_SetDomainInfo(pipes_struct *p,
-                            struct samr_SetDomainInfo *r)
+static NTSTATUS set_dom_info_1(TALLOC_CTX *mem_ctx,
+                              struct samr_DomInfo1 *r)
 {
-       struct samr_domain_info *dinfo;
        time_t u_expire, u_min_age;
+
+       u_expire = nt_time_to_unix_abs((NTTIME *)&r->max_password_age);
+       u_min_age = nt_time_to_unix_abs((NTTIME *)&r->min_password_age);
+
+       pdb_set_account_policy(PDB_POLICY_MIN_PASSWORD_LEN,
+                              (uint32_t)r->min_password_length);
+       pdb_set_account_policy(PDB_POLICY_PASSWORD_HISTORY,
+                              (uint32_t)r->password_history_length);
+       pdb_set_account_policy(PDB_POLICY_USER_MUST_LOGON_TO_CHG_PASS,
+                              (uint32_t)r->password_properties);
+       pdb_set_account_policy(PDB_POLICY_MAX_PASSWORD_AGE, (int)u_expire);
+       pdb_set_account_policy(PDB_POLICY_MIN_PASSWORD_AGE, (int)u_min_age);
+
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ ********************************************************************/
+
+static NTSTATUS set_dom_info_3(TALLOC_CTX *mem_ctx,
+                              struct samr_DomInfo3 *r)
+{
        time_t u_logout;
+
+       u_logout = nt_time_to_unix_abs((NTTIME *)&r->force_logoff_time);
+
+       pdb_set_account_policy(PDB_POLICY_TIME_TO_LOGOUT, (int)u_logout);
+
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ ********************************************************************/
+
+static NTSTATUS set_dom_info_12(TALLOC_CTX *mem_ctx,
+                               struct samr_DomInfo12 *r)
+{
        time_t u_lock_duration, u_reset_time;
-       NTSTATUS result;
+
+       u_lock_duration = nt_time_to_unix_abs((NTTIME *)&r->lockout_duration);
+       if (u_lock_duration != -1) {
+               u_lock_duration /= 60;
+       }
+
+       u_reset_time = nt_time_to_unix_abs((NTTIME *)&r->lockout_window)/60;
+
+       pdb_set_account_policy(PDB_POLICY_LOCK_ACCOUNT_DURATION, (int)u_lock_duration);
+       pdb_set_account_policy(PDB_POLICY_RESET_COUNT_TIME, (int)u_reset_time);
+       pdb_set_account_policy(PDB_POLICY_BAD_ATTEMPT_LOCKOUT,
+                              (uint32_t)r->lockout_threshold);
+
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ _samr_SetDomainInfo
+ ********************************************************************/
+
+NTSTATUS _samr_SetDomainInfo(struct pipes_struct *p,
+                            struct samr_SetDomainInfo *r)
+{
+       struct samr_domain_info *dinfo;
+       NTSTATUS status;
        uint32_t acc_required = 0;
 
        DEBUG(5,("_samr_SetDomainInfo: %d\n", __LINE__));
@@ -6281,26 +6517,19 @@ NTSTATUS _samr_SetDomainInfo(pipes_struct *p,
 
        dinfo = policy_handle_find(p, r->in.domain_handle,
                                   acc_required, NULL,
-                                  struct samr_domain_info, &result);
-       if (!NT_STATUS_IS_OK(result)) {
-               return result;
+                                  struct samr_domain_info, &status);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
        DEBUG(5,("_samr_SetDomainInfo: level: %d\n", r->in.level));
 
        switch (r->in.level) {
                case 1:
-                       u_expire=nt_time_to_unix_abs((NTTIME *)&r->in.info->info1.max_password_age);
-                       u_min_age=nt_time_to_unix_abs((NTTIME *)&r->in.info->info1.min_password_age);
-                       pdb_set_account_policy(AP_MIN_PASSWORD_LEN, (uint32)r->in.info->info1.min_password_length);
-                       pdb_set_account_policy(AP_PASSWORD_HISTORY, (uint32)r->in.info->info1.password_history_length);
-                       pdb_set_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS, (uint32)r->in.info->info1.password_properties);
-                       pdb_set_account_policy(AP_MAX_PASSWORD_AGE, (int)u_expire);
-                       pdb_set_account_policy(AP_MIN_PASSWORD_AGE, (int)u_min_age);
+                       status = set_dom_info_1(p->mem_ctx, &r->in.info->info1);
                        break;
                case 3:
-                       u_logout=nt_time_to_unix_abs((NTTIME *)&r->in.info->info3.force_logoff_time);
-                       pdb_set_account_policy(AP_TIME_TO_LOGOUT, (int)u_logout);
+                       status = set_dom_info_3(p->mem_ctx, &r->in.info->info3);
                        break;
                case 4:
                        break;
@@ -6311,20 +6540,16 @@ NTSTATUS _samr_SetDomainInfo(pipes_struct *p,
                case 9:
                        break;
                case 12:
-                       u_lock_duration=nt_time_to_unix_abs((NTTIME *)&r->in.info->info12.lockout_duration);
-                       if (u_lock_duration != -1)
-                               u_lock_duration /= 60;
-
-                       u_reset_time=nt_time_to_unix_abs((NTTIME *)&r->in.info->info12.lockout_window)/60;
-
-                       pdb_set_account_policy(AP_LOCK_ACCOUNT_DURATION, (int)u_lock_duration);
-                       pdb_set_account_policy(AP_RESET_COUNT_TIME, (int)u_reset_time);
-                       pdb_set_account_policy(AP_BAD_ATTEMPT_LOCKOUT, (uint32)r->in.info->info12.lockout_threshold);
+                       status = set_dom_info_12(p->mem_ctx, &r->in.info->info12);
                        break;
                default:
                        return NT_STATUS_INVALID_INFO_CLASS;
        }
 
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
        DEBUG(5,("_samr_SetDomainInfo: %d\n", __LINE__));
 
        return NT_STATUS_OK;
@@ -6334,7 +6559,7 @@ NTSTATUS _samr_SetDomainInfo(pipes_struct *p,
  _samr_GetDisplayEnumerationIndex
 ****************************************************************/
 
-NTSTATUS _samr_GetDisplayEnumerationIndex(pipes_struct *p,
+NTSTATUS _samr_GetDisplayEnumerationIndex(struct pipes_struct *p,
                                          struct samr_GetDisplayEnumerationIndex *r)
 {
        struct samr_domain_info *dinfo;
@@ -6460,7 +6685,7 @@ NTSTATUS _samr_GetDisplayEnumerationIndex(pipes_struct *p,
  _samr_GetDisplayEnumerationIndex2
 ****************************************************************/
 
-NTSTATUS _samr_GetDisplayEnumerationIndex2(pipes_struct *p,
+NTSTATUS _samr_GetDisplayEnumerationIndex2(struct pipes_struct *p,
                                           struct samr_GetDisplayEnumerationIndex2 *r)
 {
        struct samr_GetDisplayEnumerationIndex q;
@@ -6478,7 +6703,7 @@ NTSTATUS _samr_GetDisplayEnumerationIndex2(pipes_struct *p,
  _samr_RidToSid
 ****************************************************************/
 
-NTSTATUS _samr_RidToSid(pipes_struct *p,
+NTSTATUS _samr_RidToSid(struct pipes_struct *p,
                        struct samr_RidToSid *r)
 {
        struct samr_domain_info *dinfo;
@@ -6507,7 +6732,127 @@ NTSTATUS _samr_RidToSid(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_Shutdown(pipes_struct *p,
+static enum samr_ValidationStatus samr_ValidatePassword_Change(TALLOC_CTX *mem_ctx,
+                                                              const struct samr_PwInfo *dom_pw_info,
+                                                              const struct samr_ValidatePasswordReq2 *req,
+                                                              struct samr_ValidatePasswordRepCtr *rep)
+{
+       NTSTATUS status;
+
+       if (req->password.string == NULL) {
+               return SAMR_VALIDATION_STATUS_SUCCESS;
+       }
+       if (strlen(req->password.string) < dom_pw_info->min_password_length) {
+               ZERO_STRUCT(rep->info);
+               return SAMR_VALIDATION_STATUS_PWD_TOO_SHORT;
+       }
+       if (dom_pw_info->password_properties & DOMAIN_PASSWORD_COMPLEX) {
+               status = check_password_complexity(req->account.string,
+                                                  req->password.string,
+                                                  NULL);
+               if (!NT_STATUS_IS_OK(status)) {
+                       ZERO_STRUCT(rep->info);
+                       return SAMR_VALIDATION_STATUS_NOT_COMPLEX_ENOUGH;
+               }
+       }
+
+       return SAMR_VALIDATION_STATUS_SUCCESS;
+}
+
+/****************************************************************
+****************************************************************/
+
+static enum samr_ValidationStatus samr_ValidatePassword_Reset(TALLOC_CTX *mem_ctx,
+                                                             const struct samr_PwInfo *dom_pw_info,
+                                                             const struct samr_ValidatePasswordReq3 *req,
+                                                             struct samr_ValidatePasswordRepCtr *rep)
+{
+       NTSTATUS status;
+
+       if (req->password.string == NULL) {
+               return SAMR_VALIDATION_STATUS_SUCCESS;
+       }
+       if (strlen(req->password.string) < dom_pw_info->min_password_length) {
+               ZERO_STRUCT(rep->info);
+               return SAMR_VALIDATION_STATUS_PWD_TOO_SHORT;
+       }
+       if (dom_pw_info->password_properties & DOMAIN_PASSWORD_COMPLEX) {
+               status = check_password_complexity(req->account.string,
+                                                  req->password.string,
+                                                  NULL);
+               if (!NT_STATUS_IS_OK(status)) {
+                       ZERO_STRUCT(rep->info);
+                       return SAMR_VALIDATION_STATUS_NOT_COMPLEX_ENOUGH;
+               }
+       }
+
+       return SAMR_VALIDATION_STATUS_SUCCESS;
+}
+
+/****************************************************************
+ _samr_ValidatePassword
+****************************************************************/
+
+NTSTATUS _samr_ValidatePassword(struct pipes_struct *p,
+                               struct samr_ValidatePassword *r)
+{
+       union samr_ValidatePasswordRep *rep;
+       NTSTATUS status;
+       struct samr_GetDomPwInfo pw;
+       struct samr_PwInfo dom_pw_info;
+
+       if (r->in.level < 1 || r->in.level > 3) {
+               return NT_STATUS_INVALID_INFO_CLASS;
+       }
+
+       pw.in.domain_name = NULL;
+       pw.out.info = &dom_pw_info;
+
+       status = _samr_GetDomPwInfo(p, &pw);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       rep = talloc_zero(p->mem_ctx, union samr_ValidatePasswordRep);
+       if (!rep) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       switch (r->in.level) {
+       case 1:
+               status = NT_STATUS_NOT_SUPPORTED;
+               break;
+       case 2:
+               rep->ctr2.status = samr_ValidatePassword_Change(p->mem_ctx,
+                                                               &dom_pw_info,
+                                                               &r->in.req->req2,
+                                                               &rep->ctr2);
+               break;
+       case 3:
+               rep->ctr3.status = samr_ValidatePassword_Reset(p->mem_ctx,
+                                                              &dom_pw_info,
+                                                              &r->in.req->req3,
+                                                              &rep->ctr3);
+               break;
+       default:
+               status = NT_STATUS_INVALID_INFO_CLASS;
+               break;
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(rep);
+               return status;
+       }
+
+       *r->out.rep = rep;
+
+       return NT_STATUS_OK;
+}
+
+/****************************************************************
+****************************************************************/
+
+NTSTATUS _samr_Shutdown(struct pipes_struct *p,
                        struct samr_Shutdown *r)
 {
        p->rng_fault_state = true;
@@ -6517,7 +6862,7 @@ NTSTATUS _samr_Shutdown(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_SetMemberAttributesOfGroup(pipes_struct *p,
+NTSTATUS _samr_SetMemberAttributesOfGroup(struct pipes_struct *p,
                                          struct samr_SetMemberAttributesOfGroup *r)
 {
        p->rng_fault_state = true;
@@ -6527,7 +6872,7 @@ NTSTATUS _samr_SetMemberAttributesOfGroup(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_TestPrivateFunctionsDomain(pipes_struct *p,
+NTSTATUS _samr_TestPrivateFunctionsDomain(struct pipes_struct *p,
                                          struct samr_TestPrivateFunctionsDomain *r)
 {
        return NT_STATUS_NOT_IMPLEMENTED;
@@ -6536,7 +6881,7 @@ NTSTATUS _samr_TestPrivateFunctionsDomain(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_TestPrivateFunctionsUser(pipes_struct *p,
+NTSTATUS _samr_TestPrivateFunctionsUser(struct pipes_struct *p,
                                        struct samr_TestPrivateFunctionsUser *r)
 {
        return NT_STATUS_NOT_IMPLEMENTED;
@@ -6545,7 +6890,7 @@ NTSTATUS _samr_TestPrivateFunctionsUser(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_AddMultipleMembersToAlias(pipes_struct *p,
+NTSTATUS _samr_AddMultipleMembersToAlias(struct pipes_struct *p,
                                         struct samr_AddMultipleMembersToAlias *r)
 {
        p->rng_fault_state = true;
@@ -6555,7 +6900,7 @@ NTSTATUS _samr_AddMultipleMembersToAlias(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_RemoveMultipleMembersFromAlias(pipes_struct *p,
+NTSTATUS _samr_RemoveMultipleMembersFromAlias(struct pipes_struct *p,
                                              struct samr_RemoveMultipleMembersFromAlias *r)
 {
        p->rng_fault_state = true;
@@ -6565,7 +6910,7 @@ NTSTATUS _samr_RemoveMultipleMembersFromAlias(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_SetBootKeyInformation(pipes_struct *p,
+NTSTATUS _samr_SetBootKeyInformation(struct pipes_struct *p,
                                     struct samr_SetBootKeyInformation *r)
 {
        p->rng_fault_state = true;
@@ -6575,7 +6920,7 @@ NTSTATUS _samr_SetBootKeyInformation(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_GetBootKeyInformation(pipes_struct *p,
+NTSTATUS _samr_GetBootKeyInformation(struct pipes_struct *p,
                                     struct samr_GetBootKeyInformation *r)
 {
        p->rng_fault_state = true;
@@ -6585,19 +6930,9 @@ NTSTATUS _samr_GetBootKeyInformation(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_SetDsrmPassword(pipes_struct *p,
+NTSTATUS _samr_SetDsrmPassword(struct pipes_struct *p,
                               struct samr_SetDsrmPassword *r)
 {
        p->rng_fault_state = true;
        return NT_STATUS_NOT_IMPLEMENTED;
 }
-
-/****************************************************************
-****************************************************************/
-
-NTSTATUS _samr_ValidatePassword(pipes_struct *p,
-                               struct samr_ValidatePassword *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}