s3-lsa: Fix access_mask calculation for new handle in _lsa_CreateAccount().
[ira/wip.git] / source3 / rpc_server / srv_lsa_nt.c
index 73238a5f6fe0b96065c78b0fc125813bc96bed09..6fb83275764e83507bba99434f2a6c8550dd543e 100644 (file)
@@ -10,6 +10,7 @@
  *  Copyright (C) Simo Sorce                        2003.
  *  Copyright (C) Gerald (Jerry) Carter             2005.
  *  Copyright (C) Volker Lendecke                   2005.
+ *  Copyright (C) Guenther Deschner                2008.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
+#define MAX_LOOKUP_SIDS 0x5000 /* 20480 */
+
 extern PRIVS privs[];
 
+enum lsa_handle_type { LSA_HANDLE_POLICY_TYPE = 1, LSA_HANDLE_ACCOUNT_TYPE };
+
 struct lsa_info {
        DOM_SID sid;
        uint32 access;
+       enum lsa_handle_type type;
+};
+
+const struct generic_mapping lsa_account_mapping = {
+       LSA_ACCOUNT_READ,
+       LSA_ACCOUNT_WRITE,
+       LSA_ACCOUNT_EXECUTE,
+       LSA_ACCOUNT_ALL_ACCESS
 };
 
-const struct generic_mapping lsa_generic_mapping = {
-       POLICY_READ,
-       POLICY_WRITE,
-       POLICY_EXECUTE,
-       POLICY_ALL_ACCESS
+const struct generic_mapping lsa_policy_mapping = {
+       LSA_POLICY_READ,
+       LSA_POLICY_WRITE,
+       LSA_POLICY_EXECUTE,
+       LSA_POLICY_ALL_ACCESS
 };
 
 /***************************************************************************
@@ -67,13 +80,13 @@ static int init_lsa_ref_domain_list(TALLOC_CTX *mem_ctx,
                num = ref->count;
        }
 
-       if (num >= MAX_REF_DOMAINS) {
+       if (num >= LSA_REF_DOMAIN_LIST_MULTIPLIER) {
                /* index not found, already at maximum domain limit */
                return -1;
        }
 
        ref->count = num + 1;
-       ref->max_size = MAX_REF_DOMAINS;
+       ref->max_size = LSA_REF_DOMAIN_LIST_MULTIPLIER;
 
        ref->domains = TALLOC_REALLOC_ARRAY(mem_ctx, ref->domains,
                                            struct lsa_DomainInfo, ref->count);
@@ -81,6 +94,8 @@ static int init_lsa_ref_domain_list(TALLOC_CTX *mem_ctx,
                return -1;
        }
 
+       ZERO_STRUCT(ref->domains[num]);
+
        init_lsa_StringLarge(&ref->domains[num].name, dom_name);
        ref->domains[num].sid = sid_dup_talloc(mem_ctx, dom_sid);
        if (!ref->domains[num].sid) {
@@ -91,17 +106,6 @@ static int init_lsa_ref_domain_list(TALLOC_CTX *mem_ctx,
 }
 
 
-/*******************************************************************
- Function to free the per handle data.
- ********************************************************************/
-
-static void free_lsa_info(void *ptr)
-{
-       struct lsa_info *lsa = (struct lsa_info *)ptr;
-
-       SAFE_FREE(lsa);
-}
-
 /***************************************************************************
  initialize a lsa_DomainInfo structure.
  ***************************************************************************/
@@ -126,43 +130,6 @@ static void init_dom_query_5(struct lsa_DomainInfo *r,
        r->sid = sid;
 }
 
-/***************************************************************************
- init_dom_ref - adds a domain if it's not already in, returns the index.
-***************************************************************************/
-
-static int init_dom_ref(DOM_R_REF *ref, const char *dom_name, DOM_SID *dom_sid)
-{
-       int num = 0;
-
-       if (dom_name != NULL) {
-               for (num = 0; num < ref->num_ref_doms_1; num++) {
-                       if (sid_equal(dom_sid, &ref->ref_dom[num].ref_dom.sid))
-                               return num;
-               }
-       } else {
-               num = ref->num_ref_doms_1;
-       }
-
-       if (num >= MAX_REF_DOMAINS) {
-               /* index not found, already at maximum domain limit */
-               return -1;
-       }
-
-       ref->num_ref_doms_1 = num+1;
-       ref->ptr_ref_dom  = 1;
-       ref->max_entries = MAX_REF_DOMAINS;
-       ref->num_ref_doms_2 = num+1;
-
-       ref->hdr_ref_dom[num].ptr_dom_sid = 1; /* dom sid cannot be NULL. */
-
-       init_unistr2(&ref->ref_dom[num].uni_dom_name, dom_name, UNI_FLAGS_NONE);
-       init_uni_hdr(&ref->hdr_ref_dom[num].hdr_dom_name, &ref->ref_dom[num].uni_dom_name);
-
-       init_dom_sid2(&ref->ref_dom[num].ref_dom, dom_sid );
-
-       return num;
-}
-
 /***************************************************************************
  lookup_lsa_rids. Must be called as root for lookup_name to work.
  ***************************************************************************/
@@ -230,7 +197,9 @@ static NTSTATUS lookup_lsa_rids(TALLOC_CTX *mem_ctx,
                        mapped_count++;
                }
 
-               init_lsa_translated_sid(&prid[i], type, rid, dom_idx);
+               prid[i].sid_type        = type;
+               prid[i].rid             = rid;
+               prid[i].sid_index       = dom_idx;
        }
 
        *pmapped_count = mapped_count;
@@ -264,6 +233,8 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx,
                const char *domain;
                enum lsa_SidType type = SID_NAME_UNKNOWN;
 
+               ZERO_STRUCT(sid);
+
                /* Split name into domain and user component */
 
                full_name = name[i].string;
@@ -316,94 +287,42 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-/***************************************************************************
- Init_reply_lookup_sids.
- ***************************************************************************/
-
-static void init_reply_lookup_sids2(LSA_R_LOOKUP_SIDS2 *r_l,
-                               DOM_R_REF *ref,
-                               uint32 mapped_count)
-{
-       r_l->ptr_dom_ref  = ref ? 1 : 0;
-       r_l->dom_ref      = ref;
-       r_l->mapped_count = mapped_count;
-}
-
-/***************************************************************************
- Init_reply_lookup_sids.
- ***************************************************************************/
-
-static void init_reply_lookup_sids3(LSA_R_LOOKUP_SIDS3 *r_l,
-                               DOM_R_REF *ref,
-                               uint32 mapped_count)
-{
-       r_l->ptr_dom_ref  = ref ? 1 : 0;
-       r_l->dom_ref      = ref;
-       r_l->mapped_count = mapped_count;
-}
-
-/***************************************************************************
- Init_reply_lookup_sids.
- ***************************************************************************/
-
-static NTSTATUS init_reply_lookup_sids(TALLOC_CTX *mem_ctx,
-                               LSA_R_LOOKUP_SIDS *r_l,
-                               DOM_R_REF *ref,
-                               LSA_TRANS_NAME_ENUM2 *names,
-                               uint32 mapped_count)
+static NTSTATUS make_lsa_object_sd(TALLOC_CTX *mem_ctx, SEC_DESC **sd, size_t *sd_size,
+                                       const struct generic_mapping *map,
+                                       DOM_SID *sid, uint32_t sid_access)
 {
-       LSA_TRANS_NAME_ENUM *oldnames = &r_l->names;
-
-       oldnames->num_entries = names->num_entries;
-       oldnames->ptr_trans_names = names->ptr_trans_names;
-       oldnames->num_entries2 = names->num_entries2;
-       oldnames->uni_name = names->uni_name;
-
-       if (names->num_entries) {
-               int i;
-
-               oldnames->name = TALLOC_ARRAY(mem_ctx, LSA_TRANS_NAME, names->num_entries);
-
-               if (!oldnames->name) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-               for (i = 0; i < names->num_entries; i++) {
-                       oldnames->name[i].sid_name_use = names->name[i].sid_name_use;
-                       oldnames->name[i].hdr_name = names->name[i].hdr_name;
-                       oldnames->name[i].domain_idx = names->name[i].domain_idx;
-               }
-       }
+       DOM_SID adm_sid;
+       SEC_ACE ace[5];
+       size_t i = 0;
 
-       r_l->ptr_dom_ref  = ref ? 1 : 0;
-       r_l->dom_ref      = ref;
-       r_l->mapped_count = mapped_count;
-       return NT_STATUS_OK;
-}
+       SEC_ACL *psa = NULL;
 
-static NTSTATUS lsa_get_generic_sd(TALLOC_CTX *mem_ctx, SEC_DESC **sd, size_t *sd_size)
-{
-       DOM_SID local_adm_sid;
-       DOM_SID adm_sid;
+       /* READ|EXECUTE access for Everyone */
 
-       SEC_ACE ace[3];
-       SEC_ACCESS mask;
+       init_sec_ace(&ace[i++], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED,
+                       map->generic_execute | map->generic_read, 0);
 
-       SEC_ACL *psa = NULL;
+       /* Add Full Access 'BUILTIN\Administrators' and 'BUILTIN\Account Operators */
 
-       init_sec_access(&mask, POLICY_EXECUTE);
-       init_sec_ace(&ace[0], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+       init_sec_ace(&ace[i++], &global_sid_Builtin_Administrators,
+                       SEC_ACE_TYPE_ACCESS_ALLOWED, map->generic_all, 0);
+       init_sec_ace(&ace[i++], &global_sid_Builtin_Account_Operators,
+                       SEC_ACE_TYPE_ACCESS_ALLOWED, map->generic_all, 0);
 
+       /* Add Full Access for Domain Admins */
        sid_copy(&adm_sid, get_global_sam_sid());
        sid_append_rid(&adm_sid, DOMAIN_GROUP_RID_ADMINS);
-       init_sec_access(&mask, POLICY_ALL_ACCESS);
-       init_sec_ace(&ace[1], &adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+       init_sec_ace(&ace[i++], &adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED,
+                       map->generic_all, 0);
+
+       /* If we have a sid, give it some special access */
 
-       sid_copy(&local_adm_sid, &global_sid_Builtin);
-       sid_append_rid(&local_adm_sid, BUILTIN_ALIAS_RID_ADMINS);
-       init_sec_access(&mask, POLICY_ALL_ACCESS);
-       init_sec_ace(&ace[2], &local_adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+       if (sid) {
+               init_sec_ace(&ace[i++], sid, SEC_ACE_TYPE_ACCESS_ALLOWED,
+                       sid_access, 0);
+       }
 
-       if((psa = make_sec_acl(mem_ctx, NT4_ACL_REVISION, 3, ace)) == NULL)
+       if((psa = make_sec_acl(mem_ctx, NT4_ACL_REVISION, i, ace)) == NULL)
                return NT_STATUS_NO_MEMORY;
 
        if((*sd = make_sec_desc(mem_ctx, SECURITY_DESCRIPTOR_REVISION_1,
@@ -414,49 +333,6 @@ static NTSTATUS lsa_get_generic_sd(TALLOC_CTX *mem_ctx, SEC_DESC **sd, size_t *s
        return NT_STATUS_OK;
 }
 
-#if 0  /* AD DC work in ongoing in Samba 4 */
-
-/***************************************************************************
- Init_dns_dom_info.
-***************************************************************************/
-
-static void init_dns_dom_info(LSA_DNS_DOM_INFO *r_l, const char *nb_name,
-                             const char *dns_name, const char *forest_name,
-                             struct GUID *dom_guid, DOM_SID *dom_sid)
-{
-       if (nb_name && *nb_name) {
-               init_unistr2(&r_l->uni_nb_dom_name, nb_name, UNI_FLAGS_NONE);
-               init_uni_hdr(&r_l->hdr_nb_dom_name, &r_l->uni_nb_dom_name);
-               r_l->hdr_nb_dom_name.uni_max_len += 2;
-               r_l->uni_nb_dom_name.uni_max_len += 1;
-       }
-
-       if (dns_name && *dns_name) {
-               init_unistr2(&r_l->uni_dns_dom_name, dns_name, UNI_FLAGS_NONE);
-               init_uni_hdr(&r_l->hdr_dns_dom_name, &r_l->uni_dns_dom_name);
-               r_l->hdr_dns_dom_name.uni_max_len += 2;
-               r_l->uni_dns_dom_name.uni_max_len += 1;
-       }
-
-       if (forest_name && *forest_name) {
-               init_unistr2(&r_l->uni_forest_name, forest_name, UNI_FLAGS_NONE);
-               init_uni_hdr(&r_l->hdr_forest_name, &r_l->uni_forest_name);
-               r_l->hdr_forest_name.uni_max_len += 2;
-               r_l->uni_forest_name.uni_max_len += 1;
-       }
-
-       /* how do we init the guid ? probably should write an init fn */
-       if (dom_guid) {
-               memcpy(&r_l->dom_guid, dom_guid, sizeof(struct GUID));
-       }
-
-       if (dom_sid) {
-               r_l->ptr_dom_sid = 1;
-               init_dom_sid2(&r_l->dom_sid, dom_sid);
-       }
-}
-#endif /* AD DC work in ongoing in Samba 4 */
-
 
 /***************************************************************************
  _lsa_OpenPolicy2
@@ -472,37 +348,41 @@ NTSTATUS _lsa_OpenPolicy2(pipes_struct *p,
        uint32 acc_granted;
        NTSTATUS status;
 
+       /* Work out max allowed. */
+       map_max_allowed_access(p->server_info->ptok,
+                              &p->server_info->utok,
+                              &des_access);
 
        /* map the generic bits to the lsa policy ones */
-       se_map_generic(&des_access, &lsa_generic_mapping);
+       se_map_generic(&des_access, &lsa_policy_mapping);
 
        /* get the generic lsa policy SD until we store it */
-       lsa_get_generic_sd(p->mem_ctx, &psd, &sd_size);
-
-       if(!se_access_check(psd, p->pipe_user.nt_user_token, des_access, &acc_granted, &status)) {
-               if (p->pipe_user.ut.uid != sec_initial_uid()) {
-                       return status;
-               }
-               DEBUG(4,("ACCESS should be DENIED (granted: %#010x;  required: %#010x)\n",
-                        acc_granted, des_access));
-               DEBUGADD(4,("but overwritten by euid == 0\n"));
+       status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size, &lsa_policy_mapping,
+                       NULL, 0);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       /* This is needed for lsa_open_account and rpcclient .... :-) */
+       status = access_check_object(psd, p->server_info->ptok,
+               NULL, 0, des_access,
+               &acc_granted, "_lsa_OpenPolicy2" );
 
-       if (p->pipe_user.ut.uid == sec_initial_uid())
-               acc_granted = POLICY_ALL_ACCESS;
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
        /* associate the domain SID with the (unique) handle. */
-       if ((info = SMB_MALLOC_P(struct lsa_info)) == NULL)
+       info = TALLOC_ZERO_P(p->mem_ctx, struct lsa_info);
+       if (info == NULL) {
                return NT_STATUS_NO_MEMORY;
+       }
 
-       ZERO_STRUCTP(info);
        sid_copy(&info->sid,get_global_sam_sid());
        info->access = acc_granted;
+       info->type = LSA_HANDLE_POLICY_TYPE;
 
        /* set up the LSA QUERY INFO response */
-       if (!create_policy_hnd(p, r->out.handle, free_lsa_info, (void *)info))
+       if (!create_policy_hnd(p, r->out.handle, info))
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 
        return NT_STATUS_OK;
@@ -515,43 +395,15 @@ NTSTATUS _lsa_OpenPolicy2(pipes_struct *p,
 NTSTATUS _lsa_OpenPolicy(pipes_struct *p,
                         struct lsa_OpenPolicy *r)
 {
-       struct lsa_info *info;
-       SEC_DESC *psd = NULL;
-       size_t sd_size;
-       uint32 des_access= r->in.access_mask;
-       uint32 acc_granted;
-       NTSTATUS status;
-
-
-       /* map the generic bits to the lsa policy ones */
-       se_map_generic(&des_access, &lsa_generic_mapping);
-
-       /* get the generic lsa policy SD until we store it */
-       lsa_get_generic_sd(p->mem_ctx, &psd, &sd_size);
-
-       if(!se_access_check(psd, p->pipe_user.nt_user_token, des_access, &acc_granted, &status)) {
-               if (geteuid() != 0) {
-                       return status;
-               }
-               DEBUG(4,("ACCESS should be DENIED (granted: %#010x;  required: %#010x)\n",
-                        acc_granted, des_access));
-               DEBUGADD(4,("but overwritten by euid == 0\n"));
-               acc_granted = des_access;
-       }
-
-       /* associate the domain SID with the (unique) handle. */
-       if ((info = SMB_MALLOC_P(struct lsa_info)) == NULL)
-               return NT_STATUS_NO_MEMORY;
+       struct lsa_OpenPolicy2 o;
 
-       ZERO_STRUCTP(info);
-       sid_copy(&info->sid,get_global_sam_sid());
-       info->access = acc_granted;
+       o.in.system_name        = NULL; /* should be ignored */
+       o.in.attr               = r->in.attr;
+       o.in.access_mask        = r->in.access_mask;
 
-       /* set up the LSA QUERY INFO response */
-       if (!create_policy_hnd(p, r->out.handle, free_lsa_info, (void *)info))
-               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       o.out.handle            = r->out.handle;
 
-       return NT_STATUS_OK;
+       return _lsa_OpenPolicy2(p, &o);
 }
 
 /***************************************************************************
@@ -583,11 +435,17 @@ NTSTATUS _lsa_EnumTrustDom(pipes_struct *p,
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       /* check if the user have enough rights */
-       if (!(info->access & POLICY_VIEW_LOCAL_INFORMATION))
+       if (info->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       /* check if the user has enough rights */
+       if (!(info->access & LSA_POLICY_VIEW_LOCAL_INFORMATION))
                return NT_STATUS_ACCESS_DENIED;
 
+       become_root();
        nt_status = pdb_enum_trusteddoms(p->mem_ctx, &num_domains, &domains);
+       unbecome_root();
 
        if (!NT_STATUS_IS_OK(nt_status)) {
                return nt_status;
@@ -630,6 +488,10 @@ NTSTATUS _lsa_EnumTrustDom(pipes_struct *p,
        return nt_status;
 }
 
+#define LSA_AUDIT_NUM_CATEGORIES_NT4   7
+#define LSA_AUDIT_NUM_CATEGORIES_WIN2K 9
+#define LSA_AUDIT_NUM_CATEGORIES LSA_AUDIT_NUM_CATEGORIES_NT4
+
 /***************************************************************************
  _lsa_QueryInfoPolicy
  ***************************************************************************/
@@ -643,23 +505,69 @@ NTSTATUS _lsa_QueryInfoPolicy(pipes_struct *p,
        const char *name;
        DOM_SID *sid = NULL;
        union lsa_PolicyInformation *info = NULL;
+       uint32_t acc_required = 0;
 
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle))
                return NT_STATUS_INVALID_HANDLE;
 
+       if (handle->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       switch (r->in.level) {
+       case LSA_POLICY_INFO_AUDIT_LOG:
+       case LSA_POLICY_INFO_AUDIT_EVENTS:
+               acc_required = LSA_POLICY_VIEW_AUDIT_INFORMATION;
+               break;
+       case LSA_POLICY_INFO_DOMAIN:
+               acc_required = LSA_POLICY_VIEW_LOCAL_INFORMATION;
+               break;
+       case LSA_POLICY_INFO_PD:
+               acc_required = LSA_POLICY_GET_PRIVATE_INFORMATION;
+               break;
+       case LSA_POLICY_INFO_ACCOUNT_DOMAIN:
+               acc_required = LSA_POLICY_VIEW_LOCAL_INFORMATION;
+               break;
+       case LSA_POLICY_INFO_ROLE:
+       case LSA_POLICY_INFO_REPLICA:
+               acc_required = LSA_POLICY_VIEW_LOCAL_INFORMATION;
+               break;
+       case LSA_POLICY_INFO_QUOTA:
+               acc_required = LSA_POLICY_VIEW_LOCAL_INFORMATION;
+               break;
+       case LSA_POLICY_INFO_MOD:
+       case LSA_POLICY_INFO_AUDIT_FULL_SET:
+               /* according to MS-LSAD 3.1.4.4.3 */
+               return NT_STATUS_INVALID_PARAMETER;
+       case LSA_POLICY_INFO_AUDIT_FULL_QUERY:
+               acc_required = LSA_POLICY_VIEW_AUDIT_INFORMATION;
+               break;
+       case LSA_POLICY_INFO_DNS:
+       case LSA_POLICY_INFO_DNS_INT:
+       case LSA_POLICY_INFO_L_ACCOUNT_DOMAIN:
+               acc_required = LSA_POLICY_VIEW_LOCAL_INFORMATION;
+               break;
+       default:
+               break;
+       }
+
+       if (!(handle->access & acc_required)) {
+               /* return NT_STATUS_ACCESS_DENIED; */
+       }
+
        info = TALLOC_ZERO_P(p->mem_ctx, union lsa_PolicyInformation);
        if (!info) {
                return NT_STATUS_NO_MEMORY;
        }
 
        switch (r->in.level) {
-       case 0x02:
+       case LSA_POLICY_INFO_AUDIT_EVENTS:
                {
 
                uint32 policy_def = LSA_AUDIT_POLICY_ALL;
 
-               /* check if the user have enough rights */
-               if (!(handle->access & POLICY_VIEW_AUDIT_INFORMATION)) {
+               /* check if the user has enough rights */
+               if (!(handle->access & LSA_POLICY_VIEW_AUDIT_INFORMATION)) {
                        DEBUG(10,("_lsa_QueryInfoPolicy: insufficient access rights\n"));
                        return NT_STATUS_ACCESS_DENIED;
                }
@@ -685,9 +593,9 @@ NTSTATUS _lsa_QueryInfoPolicy(pipes_struct *p,
 
                break;
                }
-       case 0x03:
-               /* check if the user have enough rights */
-               if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
+       case LSA_POLICY_INFO_DOMAIN:
+               /* check if the user has enough rights */
+               if (!(handle->access & LSA_POLICY_VIEW_LOCAL_INFORMATION))
                        return NT_STATUS_ACCESS_DENIED;
 
                /* Request PolicyPrimaryDomainInformation. */
@@ -695,15 +603,22 @@ NTSTATUS _lsa_QueryInfoPolicy(pipes_struct *p,
                        case ROLE_DOMAIN_PDC:
                        case ROLE_DOMAIN_BDC:
                                name = get_global_sam_name();
-                               sid = get_global_sam_sid();
+                               sid = sid_dup_talloc(p->mem_ctx, get_global_sam_sid());
+                               if (!sid) {
+                                       return NT_STATUS_NO_MEMORY;
+                               }
                                break;
                        case ROLE_DOMAIN_MEMBER:
                                name = lp_workgroup();
                                /* We need to return the Domain SID here. */
-                               if (secrets_fetch_domain_sid(lp_workgroup(), &domain_sid))
-                                       sid = &domain_sid;
-                               else
+                               if (secrets_fetch_domain_sid(lp_workgroup(), &domain_sid)) {
+                                       sid = sid_dup_talloc(p->mem_ctx, &domain_sid);
+                                       if (!sid) {
+                                               return NT_STATUS_NO_MEMORY;
+                                       }
+                               } else {
                                        return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+                               }
                                break;
                        case ROLE_STANDALONE:
                                name = lp_workgroup();
@@ -714,9 +629,9 @@ NTSTATUS _lsa_QueryInfoPolicy(pipes_struct *p,
                }
                init_dom_query_3(&info->domain, name, sid);
                break;
-       case 0x05:
-               /* check if the user have enough rights */
-               if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
+       case LSA_POLICY_INFO_ACCOUNT_DOMAIN:
+               /* check if the user has enough rights */
+               if (!(handle->access & LSA_POLICY_VIEW_LOCAL_INFORMATION))
                        return NT_STATUS_ACCESS_DENIED;
 
                /* Request PolicyAccountDomainInformation. */
@@ -725,9 +640,9 @@ NTSTATUS _lsa_QueryInfoPolicy(pipes_struct *p,
 
                init_dom_query_5(&info->account_domain, name, sid);
                break;
-       case 0x06:
-               /* check if the user have enough rights */
-               if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
+       case LSA_POLICY_INFO_ROLE:
+               /* check if the user has enough rights */
+               if (!(handle->access & LSA_POLICY_VIEW_LOCAL_INFORMATION))
                        return NT_STATUS_ACCESS_DENIED;
 
                switch (lp_server_role()) {
@@ -736,17 +651,44 @@ NTSTATUS _lsa_QueryInfoPolicy(pipes_struct *p,
                                 * only a BDC is a backup controller
                                 * of the domain, it controls.
                                 */
-                               info->role.role = 2;
+                               info->role.role = LSA_ROLE_BACKUP;
                                break;
                        default:
                                /*
                                 * any other role is a primary
                                 * of the domain, it controls.
                                 */
-                               info->role.role = 3;
+                               info->role.role = LSA_ROLE_PRIMARY;
                                break;
                }
                break;
+       case LSA_POLICY_INFO_DNS:
+       case LSA_POLICY_INFO_DNS_INT: {
+               struct pdb_domain_info *dominfo;
+
+               if ((pdb_capabilities() & PDB_CAP_ADS) == 0) {
+                       DEBUG(10, ("Not replying to LSA_POLICY_INFO_DNS "
+                                  "without ADS passdb backend\n"));
+                       status = NT_STATUS_INVALID_INFO_CLASS;
+                       break;
+               }
+
+               dominfo = pdb_get_domain_info(info);
+               if (dominfo == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       break;
+               }
+
+               init_lsa_StringLarge(&info->dns.name,
+                                    dominfo->name);
+               init_lsa_StringLarge(&info->dns.dns_domain,
+                                    dominfo->dns_domain);
+               init_lsa_StringLarge(&info->dns.dns_forest,
+                                    dominfo->dns_forest);
+               info->dns.domain_guid = dominfo->guid;
+               info->dns.sid = &dominfo->sid;
+               break;
+       }
        default:
                DEBUG(0,("_lsa_QueryInfoPolicy: unknown info level in Lsa Query: %d\n",
                        r->in.level));
@@ -759,43 +701,67 @@ NTSTATUS _lsa_QueryInfoPolicy(pipes_struct *p,
        return status;
 }
 
+/***************************************************************************
+ _lsa_QueryInfoPolicy2
+ ***************************************************************************/
+
+NTSTATUS _lsa_QueryInfoPolicy2(pipes_struct *p,
+                              struct lsa_QueryInfoPolicy2 *r2)
+{
+       struct lsa_QueryInfoPolicy r;
+
+       if ((pdb_capabilities() & PDB_CAP_ADS) == 0) {
+               p->rng_fault_state = True;
+               return NT_STATUS_NOT_IMPLEMENTED;
+       }
+
+       ZERO_STRUCT(r);
+       r.in.handle = r2->in.handle;
+       r.in.level = r2->in.level;
+       r.out.info = r2->out.info;
+
+       return _lsa_QueryInfoPolicy(p, &r);
+}
+
 /***************************************************************************
  _lsa_lookup_sids_internal
  ***************************************************************************/
 
 static NTSTATUS _lsa_lookup_sids_internal(pipes_struct *p,
-                               uint16 level,                           /* input */
-                               int num_sids,                           /* input */
-                               const DOM_SID2 *sid,                    /* input */
-                               DOM_R_REF **pp_ref,                     /* output */
-                               LSA_TRANS_NAME_ENUM2 *names,            /* input/output */
-                               uint32 *pp_mapped_count)
+                                         TALLOC_CTX *mem_ctx,
+                                         uint16_t level,                       /* input */
+                                         int num_sids,                         /* input */
+                                         struct lsa_SidPtr *sid,               /* input */
+                                         struct lsa_RefDomainList **pp_ref,    /* input/output */
+                                         struct lsa_TranslatedName2 **pp_names,/* input/output */
+                                         uint32_t *pp_mapped_count)            /* input/output */
 {
        NTSTATUS status;
        int i;
        const DOM_SID **sids = NULL;
-       DOM_R_REF *ref = NULL;
+       struct lsa_RefDomainList *ref = NULL;
        uint32 mapped_count = 0;
        struct lsa_dom_info *dom_infos = NULL;
        struct lsa_name_info *name_infos = NULL;
+       struct lsa_TranslatedName2 *names = NULL;
 
        *pp_mapped_count = 0;
+       *pp_names = NULL;
        *pp_ref = NULL;
-       ZERO_STRUCTP(names);
 
        if (num_sids == 0) {
                return NT_STATUS_OK;
        }
 
        sids = TALLOC_ARRAY(p->mem_ctx, const DOM_SID *, num_sids);
-       ref = TALLOC_ZERO_P(p->mem_ctx, DOM_R_REF);
+       ref = TALLOC_ZERO_P(p->mem_ctx, struct lsa_RefDomainList);
 
        if (sids == NULL || ref == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
        for (i=0; i<num_sids; i++) {
-               sids[i] = &sid[i].sid;
+               sids[i] = sid[i].sid;
        }
 
        status = lookup_sids(p->mem_ctx, num_sids, sids, level,
@@ -805,20 +771,20 @@ static NTSTATUS _lsa_lookup_sids_internal(pipes_struct *p,
                return status;
        }
 
-       names->name = TALLOC_ARRAY(p->mem_ctx, LSA_TRANS_NAME2, num_sids);
-       names->uni_name = TALLOC_ARRAY(p->mem_ctx, UNISTR2, num_sids);
-       if ((names->name == NULL) || (names->uni_name == NULL)) {
+       names = TALLOC_ARRAY(p->mem_ctx, struct lsa_TranslatedName2, num_sids);
+       if (names == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       for (i=0; i<MAX_REF_DOMAINS; i++) {
+       for (i=0; i<LSA_REF_DOMAIN_LIST_MULTIPLIER; i++) {
 
                if (!dom_infos[i].valid) {
                        break;
                }
 
-               if (init_dom_ref(ref, dom_infos[i].name,
-                                &dom_infos[i].sid) != i) {
+               if (init_lsa_ref_domain_list(mem_ctx, ref,
+                                            dom_infos[i].name,
+                                            &dom_infos[i].sid) != i) {
                        DEBUG(0, ("Domain %s mentioned twice??\n",
                                  dom_infos[i].name));
                        return NT_STATUS_INTERNAL_ERROR;
@@ -846,13 +812,12 @@ static NTSTATUS _lsa_lookup_sids_internal(pipes_struct *p,
                } else {
                        mapped_count += 1;
                }
-               init_lsa_trans_name2(&names->name[i], &names->uni_name[i],
-                                   name->type, name->name, name->dom_idx);
-       }
 
-       names->num_entries = num_sids;
-       names->ptr_trans_names = 1;
-       names->num_entries2 = num_sids;
+               names[i].sid_type       = name->type;
+               names[i].name.string    = name->name;
+               names[i].sid_index      = name->dom_idx;
+               names[i].unknown        = 0;
+       }
 
        status = NT_STATUS_NONE_MAPPED;
        if (mapped_count > 0) {
@@ -864,147 +829,193 @@ static NTSTATUS _lsa_lookup_sids_internal(pipes_struct *p,
                   num_sids, mapped_count, nt_errstr(status)));
 
        *pp_mapped_count = mapped_count;
+       *pp_names = names;
        *pp_ref = ref;
 
        return status;
 }
 
 /***************************************************************************
- _lsa_lookup_sids
+ _lsa_LookupSids
  ***************************************************************************/
 
-NTSTATUS _lsa_lookup_sids(pipes_struct *p,
-                         LSA_Q_LOOKUP_SIDS *q_u,
-                         LSA_R_LOOKUP_SIDS *r_u)
+NTSTATUS _lsa_LookupSids(pipes_struct *p,
+                        struct lsa_LookupSids *r)
 {
+       NTSTATUS status;
        struct lsa_info *handle;
-       int num_sids = q_u->sids.num_entries;
+       int num_sids = r->in.sids->num_sids;
        uint32 mapped_count = 0;
-       DOM_R_REF *ref = NULL;
-       LSA_TRANS_NAME_ENUM2 names;
-       NTSTATUS status;
+       struct lsa_RefDomainList *domains = NULL;
+       struct lsa_TranslatedName *names_out = NULL;
+       struct lsa_TranslatedName2 *names = NULL;
+       int i;
 
-       if ((q_u->level < 1) || (q_u->level > 6)) {
+       if ((r->in.level < 1) || (r->in.level > 6)) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)(void *)&handle)) {
+       if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle)) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (handle->type != LSA_HANDLE_POLICY_TYPE) {
                return NT_STATUS_INVALID_HANDLE;
        }
 
        /* check if the user has enough rights */
-       if (!(handle->access & POLICY_LOOKUP_NAMES)) {
+       if (!(handle->access & LSA_POLICY_LOOKUP_NAMES)) {
                return NT_STATUS_ACCESS_DENIED;
        }
 
        if (num_sids >  MAX_LOOKUP_SIDS) {
-               DEBUG(5,("_lsa_lookup_sids: limit of %d exceeded, requested %d\n",
+               DEBUG(5,("_lsa_LookupSids: limit of %d exceeded, requested %d\n",
                         MAX_LOOKUP_SIDS, num_sids));
                return NT_STATUS_NONE_MAPPED;
        }
 
-       r_u->status = _lsa_lookup_sids_internal(p,
-                                               q_u->level,
-                                               num_sids,
-                                               q_u->sids.sid,
-                                               &ref,
-                                               &names,
-                                               &mapped_count);
+       status = _lsa_lookup_sids_internal(p,
+                                          p->mem_ctx,
+                                          r->in.level,
+                                          num_sids,
+                                          r->in.sids->sids,
+                                          &domains,
+                                          &names,
+                                          &mapped_count);
+
+       /* Only return here when there is a real error.
+          NT_STATUS_NONE_MAPPED is a special case as it indicates that none of
+          the requested sids could be resolved. Older versions of XP (pre SP3)
+          rely that we return with the string representations of those SIDs in
+          that case. If we don't, XP crashes - Guenther
+          */
+
+       if (NT_STATUS_IS_ERR(status) &&
+           !NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
+               return status;
+       }
 
-       /* Convert from LSA_TRANS_NAME_ENUM2 to LSA_TRANS_NAME_ENUM */
+       /* Convert from lsa_TranslatedName2 to lsa_TranslatedName */
+       names_out = TALLOC_ARRAY(p->mem_ctx, struct lsa_TranslatedName,
+                                num_sids);
+       if (!names_out) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       status = init_reply_lookup_sids(p->mem_ctx, r_u, ref, &names, mapped_count);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
+       for (i=0; i<num_sids; i++) {
+               names_out[i].sid_type = names[i].sid_type;
+               names_out[i].name = names[i].name;
+               names_out[i].sid_index = names[i].sid_index;
        }
-       return r_u->status;
+
+       *r->out.domains = domains;
+       r->out.names->count = num_sids;
+       r->out.names->names = names_out;
+       *r->out.count = mapped_count;
+
+       return status;
 }
 
 /***************************************************************************
- _lsa_lookup_sids2
+ _lsa_LookupSids2
  ***************************************************************************/
 
-NTSTATUS _lsa_lookup_sids2(pipes_struct *p,
-                         LSA_Q_LOOKUP_SIDS2 *q_u,
-                         LSA_R_LOOKUP_SIDS2 *r_u)
+NTSTATUS _lsa_LookupSids2(pipes_struct *p,
+                         struct lsa_LookupSids2 *r)
 {
+       NTSTATUS status;
        struct lsa_info *handle;
-       int num_sids = q_u->sids.num_entries;
+       int num_sids = r->in.sids->num_sids;
        uint32 mapped_count = 0;
-       DOM_R_REF *ref = NULL;
+       struct lsa_RefDomainList *domains = NULL;
+       struct lsa_TranslatedName2 *names = NULL;
+       bool check_policy = true;
 
-       if ((q_u->level < 1) || (q_u->level > 6)) {
-               return NT_STATUS_INVALID_PARAMETER;
+       switch (p->hdr_req.opnum) {
+               case NDR_LSA_LOOKUPSIDS3:
+                       check_policy = false;
+                       break;
+               case NDR_LSA_LOOKUPSIDS2:
+               default:
+                       check_policy = true;
        }
 
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)(void *)&handle)) {
-               return NT_STATUS_INVALID_HANDLE;
+       if ((r->in.level < 1) || (r->in.level > 6)) {
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       /* check if the user have enough rights */
-       if (!(handle->access & POLICY_LOOKUP_NAMES)) {
-               return NT_STATUS_ACCESS_DENIED;
+       if (check_policy) {
+               if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle)) {
+                       return NT_STATUS_INVALID_HANDLE;
+               }
+
+               if (handle->type != LSA_HANDLE_POLICY_TYPE) {
+                       return NT_STATUS_INVALID_HANDLE;
+               }
+
+               /* check if the user has enough rights */
+               if (!(handle->access & LSA_POLICY_LOOKUP_NAMES)) {
+                       return NT_STATUS_ACCESS_DENIED;
+               }
        }
 
        if (num_sids >  MAX_LOOKUP_SIDS) {
-               DEBUG(5,("_lsa_lookup_sids2: limit of %d exceeded, requested %d\n",
+               DEBUG(5,("_lsa_LookupSids2: limit of %d exceeded, requested %d\n",
                         MAX_LOOKUP_SIDS, num_sids));
                return NT_STATUS_NONE_MAPPED;
        }
 
-       r_u->status = _lsa_lookup_sids_internal(p,
-                                               q_u->level,
-                                               num_sids,
-                                               q_u->sids.sid,
-                                               &ref,
-                                               &r_u->names,
-                                               &mapped_count);
+       status = _lsa_lookup_sids_internal(p,
+                                          p->mem_ctx,
+                                          r->in.level,
+                                          num_sids,
+                                          r->in.sids->sids,
+                                          &domains,
+                                          &names,
+                                          &mapped_count);
+
+       *r->out.domains = domains;
+       r->out.names->count = num_sids;
+       r->out.names->names = names;
+       *r->out.count = mapped_count;
 
-       init_reply_lookup_sids2(r_u, ref, mapped_count);
-       return r_u->status;
+       return status;
 }
 
 /***************************************************************************
- _lsa_lookup_sida3
+ _lsa_LookupSids3
  ***************************************************************************/
 
-NTSTATUS _lsa_lookup_sids3(pipes_struct *p,
-                         LSA_Q_LOOKUP_SIDS3 *q_u,
-                         LSA_R_LOOKUP_SIDS3 *r_u)
+NTSTATUS _lsa_LookupSids3(pipes_struct *p,
+                         struct lsa_LookupSids3 *r)
 {
-       int num_sids = q_u->sids.num_entries;
-       uint32 mapped_count = 0;
-       DOM_R_REF *ref = NULL;
-
-       if ((q_u->level < 1) || (q_u->level > 6)) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
+       struct lsa_LookupSids2 q;
 
        /* No policy handle on this call. Restrict to crypto connections. */
        if (p->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL) {
-               DEBUG(0,("_lsa_lookup_sids3: client %s not using schannel for netlogon\n",
+               DEBUG(0,("_lsa_LookupSids3: client %s not using schannel for netlogon\n",
                        get_remote_machine_name() ));
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if (num_sids >  MAX_LOOKUP_SIDS) {
-               DEBUG(5,("_lsa_lookup_sids3: limit of %d exceeded, requested %d\n",
-                        MAX_LOOKUP_SIDS, num_sids));
-               return NT_STATUS_NONE_MAPPED;
-       }
+       q.in.handle             = NULL;
+       q.in.sids               = r->in.sids;
+       q.in.level              = r->in.level;
+       q.in.unknown1           = r->in.unknown1;
+       q.in.unknown2           = r->in.unknown2;
+       q.in.names              = r->in.names;
+       q.in.count              = r->in.count;
 
-       r_u->status = _lsa_lookup_sids_internal(p,
-                                               q_u->level,
-                                               num_sids,
-                                               q_u->sids.sid,
-                                               &ref,
-                                               &r_u->names,
-                                               &mapped_count);
+       q.out.domains           = r->out.domains;
+       q.out.names             = r->out.names;
+       q.out.count             = r->out.count;
 
-       init_reply_lookup_sids3(r_u, ref, mapped_count);
-       return r_u->status;
+       return _lsa_LookupSids2(p, &q);
 }
 
+/***************************************************************************
+ ***************************************************************************/
+
 static int lsa_lookup_level_to_flags(uint16 level)
 {
        int flags;
@@ -1074,8 +1085,12 @@ NTSTATUS _lsa_LookupNames(pipes_struct *p,
                goto done;
        }
 
-       /* check if the user have enough rights */
-       if (!(handle->access & POLICY_LOOKUP_NAMES)) {
+       if (handle->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       /* check if the user has enough rights */
+       if (!(handle->access & LSA_POLICY_LOOKUP_NAMES)) {
                status = NT_STATUS_ACCESS_DENIED;
                goto done;
        }
@@ -1096,10 +1111,10 @@ done:
                }
        }
 
-       *r->out.count = num_entries;
+       *r->out.count = mapped_count;
        *r->out.domains = domains;
        r->out.sids->sids = rids;
-       r->out.sids->count = mapped_count;
+       r->out.sids->count = num_entries;
 
        return status;
 }
@@ -1138,6 +1153,7 @@ NTSTATUS _lsa_LookupNames2(pipes_struct *p,
 
        status = _lsa_LookupNames(p, &q);
 
+       sid_array2->count = sid_array->count;
        sid_array2->sids = TALLOC_ARRAY(p->mem_ctx, struct lsa_TranslatedSid2, sid_array->count);
        if (!sid_array2->sids) {
                return NT_STATUS_NO_MEMORY;
@@ -1213,8 +1229,12 @@ NTSTATUS _lsa_LookupNames3(pipes_struct *p,
                        goto done;
                }
 
-               /* check if the user have enough rights */
-               if (!(handle->access & POLICY_LOOKUP_NAMES)) {
+               if (handle->type != LSA_HANDLE_POLICY_TYPE) {
+                       return NT_STATUS_INVALID_HANDLE;
+               }
+
+               /* check if the user has enough rights */
+               if (!(handle->access & LSA_POLICY_LOOKUP_NAMES)) {
                        status = NT_STATUS_ACCESS_DENIED;
                        goto done;
                }
@@ -1236,10 +1256,10 @@ done:
                }
        }
 
-       *r->out.count = num_entries;
+       *r->out.count = mapped_count;
        *r->out.domains = domains;
        r->out.sids->sids = trans_sids;
-       r->out.sids->count = mapped_count;
+       r->out.sids->count = num_entries;
 
        return status;
 }
@@ -1264,8 +1284,8 @@ NTSTATUS _lsa_LookupNames4(pipes_struct *p,
        q.in.num_names          = r->in.num_names;
        q.in.names              = r->in.names;
        q.in.level              = r->in.level;
-       q.in.unknown1           = r->in.unknown1;
-       q.in.unknown2           = r->in.unknown2;
+       q.in.lookup_options     = r->in.lookup_options;
+       q.in.client_revision    = r->in.client_revision;
        q.in.sids               = r->in.sids;
        q.in.count              = r->in.count;
 
@@ -1287,6 +1307,7 @@ NTSTATUS _lsa_Close(pipes_struct *p, struct lsa_Close *r)
        }
 
        close_policy_hnd(p, r->in.handle);
+       ZERO_STRUCTP(r->out.handle);
        return NT_STATUS_OK;
 }
 
@@ -1337,7 +1358,34 @@ NTSTATUS _lsa_SetSecret(pipes_struct *p, struct lsa_SetSecret *r)
 NTSTATUS _lsa_DeleteObject(pipes_struct *p,
                           struct lsa_DeleteObject *r)
 {
-       return NT_STATUS_ACCESS_DENIED;
+       NTSTATUS status;
+       struct lsa_info *info = NULL;
+
+       if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info)) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (!(info->access & STD_RIGHT_DELETE_ACCESS)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       switch (info->type) {
+       case LSA_HANDLE_ACCOUNT_TYPE:
+               status = privilege_delete_account(&info->sid);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(10,("_lsa_DeleteObject: privilege_delete_account gave: %s\n",
+                               nt_errstr(status)));
+                       return status;
+               }
+               break;
+       default:
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       close_policy_hnd(p, r->in.handle);
+       ZERO_STRUCTP(r->out.handle);
+
+       return status;
 }
 
 /***************************************************************************
@@ -1365,10 +1413,14 @@ NTSTATUS _lsa_EnumPrivs(pipes_struct *p,
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle))
                return NT_STATUS_INVALID_HANDLE;
 
-       /* check if the user have enough rights
+       if (handle->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       /* check if the user has enough rights
           I don't know if it's the right one. not documented.  */
 
-       if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
+       if (!(handle->access & LSA_POLICY_VIEW_LOCAL_INFORMATION))
                return NT_STATUS_ACCESS_DENIED;
 
        if (num_privs) {
@@ -1421,12 +1473,16 @@ NTSTATUS _lsa_LookupPrivDisplayName(pipes_struct *p,
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle))
                return NT_STATUS_INVALID_HANDLE;
 
-       /* check if the user have enough rights */
-
+       if (handle->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       /* check if the user has enough rights */
+
        /*
         * I don't know if it's the right one. not documented.
         */
-       if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
+       if (!(handle->access & LSA_POLICY_VIEW_LOCAL_INFORMATION))
                return NT_STATUS_ACCESS_DENIED;
 
        DEBUG(10,("_lsa_LookupPrivDisplayName: name = %s\n", r->in.name->string));
@@ -1468,7 +1524,11 @@ NTSTATUS _lsa_EnumAccounts(pipes_struct *p,
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle))
                return NT_STATUS_INVALID_HANDLE;
 
-       if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
+       if (handle->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (!(handle->access & LSA_POLICY_VIEW_LOCAL_INFORMATION))
                return NT_STATUS_ACCESS_DENIED;
 
        sid_list = NULL;
@@ -1490,14 +1550,14 @@ NTSTATUS _lsa_EnumAccounts(pipes_struct *p,
                sids = TALLOC_ZERO_ARRAY(p->mem_ctx, struct lsa_SidPtr,
                                         num_entries - *r->in.resume_handle);
                if (!sids) {
-                       SAFE_FREE(sid_list);
+                       talloc_free(sid_list);
                        return NT_STATUS_NO_MEMORY;
                }
 
                for (i = *r->in.resume_handle, j = 0; i < num_entries; i++, j++) {
                        sids[j].sid = sid_dup_talloc(p->mem_ctx, &sid_list[i]);
                        if (!sids[j].sid) {
-                               SAFE_FREE(sid_list);
+                               talloc_free(sid_list);
                                return NT_STATUS_NO_MEMORY;
                        }
                }
@@ -1520,14 +1580,20 @@ NTSTATUS _lsa_GetUserName(pipes_struct *p,
                          struct lsa_GetUserName *r)
 {
        const char *username, *domname;
-       user_struct *vuser = get_valid_user_struct(p->vuid);
        struct lsa_String *account_name = NULL;
        struct lsa_String *authority_name = NULL;
 
-       if (vuser == NULL)
-               return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+       if (r->in.account_name &&
+          *r->in.account_name) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (r->in.authority_name &&
+          *r->in.authority_name) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-       if (vuser->guest) {
+       if (p->server_info->guest) {
                /*
                 * I'm 99% sure this is not the right place to do this,
                 * global_sid_Anonymous should probably be put into the token
@@ -1538,25 +1604,28 @@ NTSTATUS _lsa_GetUserName(pipes_struct *p,
                        return NT_STATUS_NO_MEMORY;
                }
        } else {
-               username = vuser->user.smb_name;
-               domname = vuser->user.domain;
+               username = p->server_info->sanitized_username;
+               domname = pdb_get_domain(p->server_info->sam_account);
        }
 
-       account_name = TALLOC_ZERO_P(p->mem_ctx, struct lsa_String);
+       account_name = TALLOC_P(p->mem_ctx, struct lsa_String);
        if (!account_name) {
                return NT_STATUS_NO_MEMORY;
        }
+       init_lsa_String(account_name, username);
 
-       authority_name = TALLOC_ZERO_P(p->mem_ctx, struct lsa_String);
-       if (!authority_name) {
-               return NT_STATUS_NO_MEMORY;
+       if (r->out.authority_name) {
+               authority_name = TALLOC_P(p->mem_ctx, struct lsa_String);
+               if (!authority_name) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               init_lsa_String(authority_name, domname);
        }
 
-       init_lsa_String(account_name, username);
-       init_lsa_String(authority_name, domname);
-
        *r->out.account_name = account_name;
-       *r->out.authority_name = authority_name;
+       if (r->out.authority_name) {
+               *r->out.authority_name = authority_name;
+       }
 
        return NT_STATUS_OK;
 }
@@ -1568,48 +1637,65 @@ NTSTATUS _lsa_GetUserName(pipes_struct *p,
 NTSTATUS _lsa_CreateAccount(pipes_struct *p,
                            struct lsa_CreateAccount *r)
 {
+       NTSTATUS status;
        struct lsa_info *handle;
        struct lsa_info *info;
+       uint32_t acc_granted;
+       struct security_descriptor *psd;
+       uint32_t sd_size;
 
        /* find the connection policy handle. */
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle))
                return NT_STATUS_INVALID_HANDLE;
 
-       /* check if the user have enough rights */
+       if (handle->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
 
-       /*
-        * I don't know if it's the right one. not documented.
-        * but guessed with rpcclient.
-        */
-       if (!(handle->access & POLICY_GET_PRIVATE_INFORMATION))
+       /* check if the user has enough rights */
+
+       if (!(handle->access & LSA_POLICY_CREATE_ACCOUNT)) {
                return NT_STATUS_ACCESS_DENIED;
+       }
 
-       /* check to see if the pipe_user is a Domain Admin since
-          account_pol.tdb was already opened as root, this is all we have */
+       /* map the generic bits to the lsa policy ones */
+       se_map_generic(&r->in.access_mask, &lsa_account_mapping);
 
-       if ( !nt_token_check_domain_rid( p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS ) )
-               return NT_STATUS_ACCESS_DENIED;
+       status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
+                                   &lsa_account_mapping,
+                                   r->in.sid, LSA_POLICY_ALL_ACCESS);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+        status = access_check_object(psd, p->server_info->ptok,
+                NULL, 0, r->in.access_mask,
+                &acc_granted, "_lsa_CreateAccount");
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
        if ( is_privileged_sid( r->in.sid ) )
                return NT_STATUS_OBJECT_NAME_COLLISION;
 
        /* associate the user/group SID with the (unique) handle. */
 
-       if ((info = SMB_MALLOC_P(struct lsa_info)) == NULL)
+       info = TALLOC_ZERO_P(p->mem_ctx, struct lsa_info);
+       if (info == NULL) {
                return NT_STATUS_NO_MEMORY;
+       }
 
-       ZERO_STRUCTP(info);
        info->sid = *r->in.sid;
-       info->access = r->in.access_mask;
+       info->access = acc_granted;
+       info->type = LSA_HANDLE_ACCOUNT_TYPE;
 
        /* get a (unique) handle.  open a policy on it. */
-       if (!create_policy_hnd(p, r->out.acct_handle, free_lsa_info, (void *)info))
+       if (!create_policy_hnd(p, r->out.acct_handle, info))
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 
        return privilege_create_account( &info->sid );
 }
 
-
 /***************************************************************************
  _lsa_OpenAccount
  ***************************************************************************/
@@ -1619,19 +1705,46 @@ NTSTATUS _lsa_OpenAccount(pipes_struct *p,
 {
        struct lsa_info *handle;
        struct lsa_info *info;
+       SEC_DESC *psd = NULL;
+       size_t sd_size;
+       uint32_t des_access = r->in.access_mask;
+       uint32_t acc_granted;
+       NTSTATUS status;
 
        /* find the connection policy handle. */
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle))
                return NT_STATUS_INVALID_HANDLE;
 
-       /* check if the user have enough rights */
+       if (handle->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       /* des_access is for the account here, not the policy
+        * handle - so don't check against policy handle. */
 
-       /*
-        * I don't know if it's the right one. not documented.
-        * but guessed with rpcclient.
-        */
-       if (!(handle->access & POLICY_GET_PRIVATE_INFORMATION))
-               return NT_STATUS_ACCESS_DENIED;
+       /* Work out max allowed. */
+       map_max_allowed_access(p->server_info->ptok,
+                              &p->server_info->utok,
+                              &des_access);
+
+       /* map the generic bits to the lsa account ones */
+       se_map_generic(&des_access, &lsa_account_mapping);
+
+       /* get the generic lsa account SD until we store it */
+       status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
+                               &lsa_account_mapping,
+                               r->in.sid, LSA_ACCOUNT_ALL_ACCESS);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       status = access_check_object(psd, p->server_info->ptok,
+               NULL, 0, des_access,
+               &acc_granted, "_lsa_OpenAccount" );
+
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
        /* TODO: Fis the parsing routine before reenabling this check! */
        #if 0
@@ -1639,15 +1752,17 @@ NTSTATUS _lsa_OpenAccount(pipes_struct *p,
                return NT_STATUS_ACCESS_DENIED;
        #endif
        /* associate the user/group SID with the (unique) handle. */
-       if ((info = SMB_MALLOC_P(struct lsa_info)) == NULL)
+       info = TALLOC_ZERO_P(p->mem_ctx, struct lsa_info);
+       if (info == NULL) {
                return NT_STATUS_NO_MEMORY;
+       }
 
-       ZERO_STRUCTP(info);
        info->sid = *r->in.sid;
-       info->access = r->in.access_mask;
+       info->access = acc_granted;
+       info->type = LSA_HANDLE_ACCOUNT_TYPE;
 
        /* get a (unique) handle.  open a policy on it. */
-       if (!create_policy_hnd(p, r->out.acct_handle, free_lsa_info, (void *)info))
+       if (!create_policy_hnd(p, r->out.acct_handle, info))
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 
        return NT_STATUS_OK;
@@ -1673,23 +1788,29 @@ NTSTATUS _lsa_EnumPrivsAccount(pipes_struct *p,
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       if ( !get_privileges_for_sids( &mask, &info->sid, 1 ) )
-               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       if (info->type != LSA_HANDLE_ACCOUNT_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (!(info->access & LSA_ACCOUNT_VIEW))
+               return NT_STATUS_ACCESS_DENIED;
+
+       get_privileges_for_sids(&mask, &info->sid, 1);
 
        privilege_set_init( &privileges );
 
+       priv_set = TALLOC_ZERO_P(p->mem_ctx, struct lsa_PrivilegeSet);
+       if (!priv_set) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
+
        if ( se_priv_to_privilege_set( &privileges, &mask ) ) {
 
                DEBUG(10,("_lsa_EnumPrivsAccount: %s has %d privileges\n",
                          sid_string_dbg(&info->sid),
                          privileges.count));
 
-               priv_set = TALLOC_ZERO_P(p->mem_ctx, struct lsa_PrivilegeSet);
-               if (!priv_set) {
-                       status = NT_STATUS_NO_MEMORY;
-                       goto done;
-               }
-
                luid_attrs = TALLOC_ZERO_ARRAY(p->mem_ctx,
                                               struct lsa_LUIDAttribute,
                                               privileges.count);
@@ -1708,11 +1829,14 @@ NTSTATUS _lsa_EnumPrivsAccount(pipes_struct *p,
                priv_set->unknown = 0;
                priv_set->set = luid_attrs;
 
-               *r->out.privs = priv_set;
        } else {
-               status = NT_STATUS_NO_SUCH_PRIVILEGE;
+               priv_set->count = 0;
+               priv_set->unknown = 0;
+               priv_set->set = NULL;
        }
 
+       *r->out.privs = priv_set;
+
  done:
        privilege_set_free( &privileges );
 
@@ -1726,16 +1850,43 @@ NTSTATUS _lsa_EnumPrivsAccount(pipes_struct *p,
 NTSTATUS _lsa_GetSystemAccessAccount(pipes_struct *p,
                                     struct lsa_GetSystemAccessAccount *r)
 {
-       struct lsa_info *info=NULL;
+       NTSTATUS status;
+       struct lsa_info *info = NULL;
+       struct lsa_EnumPrivsAccount e;
+       struct lsa_PrivilegeSet *privset;
 
        /* find the connection policy handle. */
 
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       if (!lookup_sid(p->mem_ctx, &info->sid, NULL, NULL, NULL))
+       if (info->type != LSA_HANDLE_ACCOUNT_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (!(info->access & LSA_ACCOUNT_VIEW))
                return NT_STATUS_ACCESS_DENIED;
 
+       privset = talloc_zero(p->mem_ctx, struct lsa_PrivilegeSet);
+       if (!privset) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       e.in.handle = r->in.handle;
+       e.out.privs = &privset;
+
+       status = _lsa_EnumPrivsAccount(p, &e);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10,("_lsa_GetSystemAccessAccount: "
+                       "failed to call _lsa_EnumPrivsAccount(): %s\n",
+                       nt_errstr(status)));
+               return status;
+       }
+
+       /* Samba4 would iterate over the privset to merge the policy mode bits,
+        * not sure samba3 can do the same here, so just return what we did in
+        * the past - gd */
+
        /*
          0x01 -> Log on locally
          0x02 -> Access this computer from network
@@ -1745,7 +1896,8 @@ NTSTATUS _lsa_GetSystemAccessAccount(pipes_struct *p,
          they can be ORed together
        */
 
-       *r->out.access_mask = PR_LOG_ON_LOCALLY | PR_ACCESS_FROM_NETWORK;
+       *r->out.access_mask = LSA_POLICY_MODE_INTERACTIVE |
+                             LSA_POLICY_MODE_NETWORK;
 
        return NT_STATUS_OK;
 }
@@ -1764,11 +1916,13 @@ NTSTATUS _lsa_SetSystemAccessAccount(pipes_struct *p,
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       /* check to see if the pipe_user is a Domain Admin since
-          account_pol.tdb was already opened as root, this is all we have */
+       if (info->type != LSA_HANDLE_ACCOUNT_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
 
-       if ( !nt_token_check_domain_rid( p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS ) )
+       if (!(info->access & LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS)) {
                return NT_STATUS_ACCESS_DENIED;
+       }
 
        if (!pdb_getgrsid(&map, info->sid))
                return NT_STATUS_NO_SUCH_GROUP;
@@ -1792,12 +1946,11 @@ NTSTATUS _lsa_AddPrivilegesToAccount(pipes_struct *p,
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       /* check to see if the pipe_user is root or a Domain Admin since
-          account_pol.tdb was already opened as root, this is all we have */
+       if (info->type != LSA_HANDLE_ACCOUNT_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
 
-       if ( p->pipe_user.ut.uid != sec_initial_uid()
-               && !nt_token_check_domain_rid( p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS ) )
-       {
+       if (!(info->access & LSA_ACCOUNT_ADJUST_PRIVILEGES)) {
                return NT_STATUS_ACCESS_DENIED;
        }
 
@@ -1832,12 +1985,11 @@ NTSTATUS _lsa_RemovePrivilegesFromAccount(pipes_struct *p,
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       /* check to see if the pipe_user is root or a Domain Admin since
-          account_pol.tdb was already opened as root, this is all we have */
+       if (info->type != LSA_HANDLE_ACCOUNT_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
 
-       if ( p->pipe_user.ut.uid != sec_initial_uid()
-               && !nt_token_check_domain_rid( p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS ) )
-       {
+       if (!(info->access & LSA_ACCOUNT_ADJUST_PRIVILEGES)) {
                return NT_STATUS_ACCESS_DENIED;
        }
 
@@ -1858,122 +2010,88 @@ NTSTATUS _lsa_RemovePrivilegesFromAccount(pipes_struct *p,
 }
 
 /***************************************************************************
- _lsa_QuerySecurity
+ _lsa_LookupPrivName
  ***************************************************************************/
 
-NTSTATUS _lsa_QuerySecurity(pipes_struct *p,
-                           struct lsa_QuerySecurity *r)
+NTSTATUS _lsa_LookupPrivName(pipes_struct *p,
+                            struct lsa_LookupPrivName *r)
 {
-       struct lsa_info *handle=NULL;
-       SEC_DESC *psd = NULL;
-       size_t sd_size;
-       NTSTATUS status;
+       struct lsa_info *info = NULL;
+       const char *name;
+       struct lsa_StringLarge *lsa_name;
 
        /* find the connection policy handle. */
-       if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle))
+       if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info)) {
                return NT_STATUS_INVALID_HANDLE;
+       }
 
-       /* check if the user have enough rights */
-       if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
-               return NT_STATUS_ACCESS_DENIED;
-
-
-       switch (r->in.sec_info) {
-       case 1:
-               /* SD contains only the owner */
-
-               status=lsa_get_generic_sd(p->mem_ctx, &psd, &sd_size);
-               if(!NT_STATUS_IS_OK(status))
-                       return NT_STATUS_NO_MEMORY;
+       if (info->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
 
+       if (!(info->access & LSA_POLICY_VIEW_LOCAL_INFORMATION)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-               if((*r->out.sdbuf = make_sec_desc_buf(p->mem_ctx, sd_size, psd)) == NULL)
-                       return NT_STATUS_NO_MEMORY;
-               break;
-       case 4:
-               /* SD contains only the ACL */
+       name = luid_to_privilege_name((LUID *)r->in.luid);
+       if (!name) {
+               return NT_STATUS_NO_SUCH_PRIVILEGE;
+       }
 
-               status=lsa_get_generic_sd(p->mem_ctx, &psd, &sd_size);
-               if(!NT_STATUS_IS_OK(status))
-                       return NT_STATUS_NO_MEMORY;
+       lsa_name = TALLOC_ZERO_P(p->mem_ctx, struct lsa_StringLarge);
+       if (!lsa_name) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-               if((*r->out.sdbuf = make_sec_desc_buf(p->mem_ctx, sd_size, psd)) == NULL)
-                       return NT_STATUS_NO_MEMORY;
-               break;
-       default:
-               return NT_STATUS_INVALID_LEVEL;
+       lsa_name->string = talloc_strdup(lsa_name, name);
+       if (!lsa_name->string) {
+               TALLOC_FREE(lsa_name);
+               return NT_STATUS_NO_MEMORY;
        }
 
-       return status;
-}
+       *r->out.name = lsa_name;
 
-#if 0  /* AD DC work in ongoing in Samba 4 */
+       return NT_STATUS_OK;
+}
 
 /***************************************************************************
+ _lsa_QuerySecurity
  ***************************************************************************/
 
- NTSTATUS _lsa_query_info2(pipes_struct *p, LSA_Q_QUERY_INFO2 *q_u, LSA_R_QUERY_INFO2 *r_u)
+NTSTATUS _lsa_QuerySecurity(pipes_struct *p,
+                           struct lsa_QuerySecurity *r)
 {
-       struct lsa_info *handle;
-       const char *nb_name;
-       char *dns_name = NULL;
-       char *forest_name = NULL;
-       DOM_SID *sid = NULL;
-       struct GUID guid;
-       fstring dnsdomname;
-
-       ZERO_STRUCT(guid);
-       r_u->status = NT_STATUS_OK;
+       struct lsa_info *handle=NULL;
+       SEC_DESC *psd = NULL;
+       size_t sd_size;
+       NTSTATUS status;
 
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)(void *)&handle))
+       /* find the connection policy handle. */
+       if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&handle))
                return NT_STATUS_INVALID_HANDLE;
 
-       switch (q_u->info_class) {
-       case 0x0c:
-               /* check if the user have enough rights */
-               if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
-                       return NT_STATUS_ACCESS_DENIED;
-
-               /* Request PolicyPrimaryDomainInformation. */
-               switch (lp_server_role()) {
-                       case ROLE_DOMAIN_PDC:
-                       case ROLE_DOMAIN_BDC:
-                               nb_name = get_global_sam_name();
-                               /* ugly temp hack for these next two */
-
-                               /* This should be a 'netbios domain -> DNS domain' mapping */
-                               dnsdomname = get_mydnsdomname(p->mem_ctx);
-                               if (!dnsdomname || !*dnsdomname) {
-                                       return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
-                               }
-                               strlower_m(dnsdomname);
-
-                               dns_name = dnsdomname;
-                               forest_name = dnsdomname;
+       if (handle->type == LSA_HANDLE_POLICY_TYPE) {
+               status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
+                               &lsa_policy_mapping, NULL, 0);
+       } else if (handle->type == LSA_HANDLE_ACCOUNT_TYPE) {
+               status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
+                               &lsa_account_mapping,
+                               &handle->sid, LSA_ACCOUNT_ALL_ACCESS);
+       } else {
+               status = NT_STATUS_INVALID_HANDLE;
+       }
 
-                               sid = get_global_sam_sid();
-                               secrets_fetch_domain_guid(lp_workgroup(), &guid);
-                               break;
-                       default:
-                               return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
-               }
-               init_dns_dom_info(&r_u->info.dns_dom_info, nb_name, dns_name,
-                                 forest_name,&guid,sid);
-               break;
-       default:
-               DEBUG(0,("_lsa_query_info2: unknown info level in Lsa Query: %d\n", q_u->info_class));
-               r_u->status = NT_STATUS_INVALID_INFO_CLASS;
-               break;
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       if (NT_STATUS_IS_OK(r_u->status)) {
-               r_u->ptr = 0x1;
-               r_u->info_class = q_u->info_class;
+       *r->out.sdbuf = make_sec_desc_buf(p->mem_ctx, sd_size, psd);
+       if (!*r->out.sdbuf) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       return r_u->status;
+       return status;
 }
-#endif /* AD DC work in ongoing in Samba 4 */
 
 /***************************************************************************
  _lsa_AddAccountRights
@@ -1984,21 +2102,43 @@ NTSTATUS _lsa_AddAccountRights(pipes_struct *p,
 {
        struct lsa_info *info = NULL;
        int i = 0;
+       uint32_t acc_granted = 0;
+       SEC_DESC *psd = NULL;
+       size_t sd_size;
        DOM_SID sid;
+       NTSTATUS status;
 
        /* find the connection policy handle. */
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       /* check to see if the pipe_user is a Domain Admin since
-          account_pol.tdb was already opened as root, this is all we have */
-
-       if ( p->pipe_user.ut.uid != sec_initial_uid()
-               && !nt_token_check_domain_rid( p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS ) )
-       {
-               return NT_STATUS_ACCESS_DENIED;
+       if (info->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
        }
 
+        /* get the generic lsa account SD for this SID until we store it */
+        status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
+                                &lsa_account_mapping,
+                                r->in.sid, LSA_ACCOUNT_ALL_ACCESS);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+       /*
+        * From the MS DOCs. If the sid doesn't exist, ask for LSA_POLICY_CREATE_ACCOUNT
+        * on the policy handle. If it does, ask for
+        * LSA_ACCOUNT_ADJUST_PRIVILEGES|LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS|LSA_ACCOUNT_VIEW,
+        * on the account sid. We don't check here so just use the latter. JRA.
+        */
+
+        status = access_check_object(psd, p->server_info->ptok,
+                NULL, 0, LSA_ACCOUNT_ADJUST_PRIVILEGES|LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS|LSA_ACCOUNT_VIEW,
+                &acc_granted, "_lsa_AddAccountRights" );
+
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
        /* according to an NT4 PDC, you can add privileges to SIDs even without
           call_lsa_create_account() first.  And you can use any arbitrary SID. */
 
@@ -2032,22 +2172,44 @@ NTSTATUS _lsa_RemoveAccountRights(pipes_struct *p,
 {
        struct lsa_info *info = NULL;
        int i = 0;
+       SEC_DESC *psd = NULL;
+       size_t sd_size;
        DOM_SID sid;
        const char *privname = NULL;
+       uint32_t acc_granted = 0;
+       NTSTATUS status;
 
        /* find the connection policy handle. */
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       /* check to see if the pipe_user is a Domain Admin since
-          account_pol.tdb was already opened as root, this is all we have */
-
-       if ( p->pipe_user.ut.uid != sec_initial_uid()
-               && !nt_token_check_domain_rid( p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS ) )
-       {
-               return NT_STATUS_ACCESS_DENIED;
+       if (info->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
        }
 
+        /* get the generic lsa account SD for this SID until we store it */
+        status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
+                                &lsa_account_mapping,
+                                r->in.sid, LSA_ACCOUNT_ALL_ACCESS);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+       /*
+        * From the MS DOCs. We need
+        * LSA_ACCOUNT_ADJUST_PRIVILEGES|LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS|LSA_ACCOUNT_VIEW
+        * and DELETE on the account sid.
+        */
+
+        status = access_check_object(psd, p->server_info->ptok,
+                NULL, 0, LSA_ACCOUNT_ADJUST_PRIVILEGES|LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS|
+                       LSA_ACCOUNT_VIEW|STD_RIGHT_DELETE_ACCESS,
+                &acc_granted, "_lsa_AddAccountRights" );
+
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
        sid_copy( &sid, r->in.sid );
 
        if ( r->in.remove_all ) {
@@ -2135,25 +2297,38 @@ NTSTATUS _lsa_EnumAccountRights(pipes_struct *p,
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
+       if (info->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (!(info->access & LSA_ACCOUNT_VIEW)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
        /* according to an NT4 PDC, you can add privileges to SIDs even without
           call_lsa_create_account() first.  And you can use any arbitrary SID. */
 
        sid_copy( &sid, r->in.sid );
 
-       if ( !get_privileges_for_sids( &mask, &sid, 1 ) )
+       /* according to MS-LSAD 3.1.4.5.10 it is required to return
+        * NT_STATUS_OBJECT_NAME_NOT_FOUND if the account sid was not found in
+        * the lsa database */
+
+       if (!get_privileges_for_sids(&mask, &sid, 1)) {
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
 
-       privilege_set_init( &privileges );
+       status = privilege_set_init(&privileges);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
-       if ( se_priv_to_privilege_set( &privileges, &mask ) ) {
+       se_priv_to_privilege_set(&privileges, &mask);
 
-               DEBUG(10,("_lsa_EnumAccountRights: %s has %d privileges\n",
-                         sid_string_dbg(&sid), privileges.count));
+       DEBUG(10,("_lsa_EnumAccountRights: %s has %d privileges\n",
+                 sid_string_dbg(&sid), privileges.count));
 
-               status = init_lsa_right_set(p->mem_ctx, r->out.rights, &privileges);
-       } else {
-               status = NT_STATUS_NO_SUCH_PRIVILEGE;
-       }
+       status = init_lsa_right_set(p->mem_ctx, r->out.rights, &privileges);
 
        privilege_set_free( &privileges );
 
@@ -2177,6 +2352,13 @@ NTSTATUS _lsa_LookupPrivValue(pipes_struct *p,
        if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
+       if (info->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (!(info->access & LSA_POLICY_LOOKUP_NAMES))
+               return NT_STATUS_ACCESS_DENIED;
+
        name = r->in.name->string;
 
        DEBUG(10,("_lsa_lookup_priv_value: name = %s\n", name));
@@ -2192,6 +2374,63 @@ NTSTATUS _lsa_LookupPrivValue(pipes_struct *p,
        return NT_STATUS_OK;
 }
 
+/***************************************************************************
+ _lsa_EnumAccountsWithUserRight
+ ***************************************************************************/
+
+NTSTATUS _lsa_EnumAccountsWithUserRight(pipes_struct *p,
+                                       struct lsa_EnumAccountsWithUserRight *r)
+{
+       NTSTATUS status;
+       struct lsa_info *info = NULL;
+       struct dom_sid *sids = NULL;
+       int num_sids = 0;
+       uint32_t i;
+       SE_PRIV mask;
+
+       if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info)) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (info->type != LSA_HANDLE_POLICY_TYPE) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (!(info->access & LSA_POLICY_LOOKUP_NAMES)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       if (!r->in.name || !r->in.name->string) {
+               return NT_STATUS_NO_SUCH_PRIVILEGE;
+       }
+
+       if (!se_priv_from_name(r->in.name->string, &mask)) {
+               return NT_STATUS_NO_SUCH_PRIVILEGE;
+       }
+
+       status = privilege_enum_sids(&mask, p->mem_ctx,
+                                    &sids, &num_sids);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       r->out.sids->num_sids = num_sids;
+       r->out.sids->sids = talloc_array(p->mem_ctx, struct lsa_SidPtr,
+                                        r->out.sids->num_sids);
+
+       for (i=0; i < r->out.sids->num_sids; i++) {
+               r->out.sids->sids[i].sid = sid_dup_talloc(r->out.sids->sids,
+                                                         &sids[i]);
+               if (!r->out.sids->sids[i].sid) {
+                       TALLOC_FREE(r->out.sids->sids);
+                       r->out.sids->num_sids = 0;
+                       return NT_STATUS_NO_MEMORY;
+               }
+       }
+
+       return NT_STATUS_OK;
+}
+
 /*
  * From here on the server routines are just dummy ones to make smbd link with
  * librpc/gen_ndr/srv_lsa.c. These routines are actually never called, we are
@@ -2228,12 +2467,6 @@ NTSTATUS _lsa_ClearAuditLog(pipes_struct *p, struct lsa_ClearAuditLog *r)
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-NTSTATUS _lsa_LookupSids(pipes_struct *p, struct lsa_LookupSids *r)
-{
-       p->rng_fault_state = True;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 NTSTATUS _lsa_GetQuotasForAccount(pipes_struct *p, struct lsa_GetQuotasForAccount *r)
 {
        p->rng_fault_state = True;
@@ -2264,18 +2497,6 @@ NTSTATUS _lsa_QuerySecret(pipes_struct *p, struct lsa_QuerySecret *r)
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-NTSTATUS _lsa_LookupPrivName(pipes_struct *p, struct lsa_LookupPrivName *r)
-{
-       p->rng_fault_state = True;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS _lsa_EnumAccountsWithUserRight(pipes_struct *p, struct lsa_EnumAccountsWithUserRight *r)
-{
-       p->rng_fault_state = True;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 NTSTATUS _lsa_QueryTrustedDomainInfoBySid(pipes_struct *p, struct lsa_QueryTrustedDomainInfoBySid *r)
 {
        p->rng_fault_state = True;
@@ -2306,12 +2527,6 @@ NTSTATUS _lsa_RetrievePrivateData(pipes_struct *p, struct lsa_RetrievePrivateDat
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-NTSTATUS _lsa_QueryInfoPolicy2(pipes_struct *p, struct lsa_QueryInfoPolicy2 *r)
-{
-       p->rng_fault_state = True;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 NTSTATUS _lsa_SetInfoPolicy2(pipes_struct *p, struct lsa_SetInfoPolicy2 *r)
 {
        p->rng_fault_state = True;
@@ -2372,12 +2587,6 @@ NTSTATUS _lsa_TestCall(pipes_struct *p, struct lsa_TestCall *r)
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-NTSTATUS _lsa_LookupSids2(pipes_struct *p, struct lsa_LookupSids2 *r)
-{
-       p->rng_fault_state = True;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 NTSTATUS _lsa_CreateTrustedDomainEx2(pipes_struct *p, struct lsa_CreateTrustedDomainEx2 *r)
 {
        p->rng_fault_state = True;
@@ -2474,12 +2683,6 @@ NTSTATUS _lsa_CREDRRENAME(pipes_struct *p, struct lsa_CREDRRENAME *r)
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-NTSTATUS _lsa_LookupSids3(pipes_struct *p, struct lsa_LookupSids3 *r)
-{
-       p->rng_fault_state = True;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 NTSTATUS _lsa_LSAROPENPOLICYSCE(pipes_struct *p, struct lsa_LSAROPENPOLICYSCE *r)
 {
        p->rng_fault_state = True;