Add a become_root()/unbecome_root() pair to allow acces to the passdb for
[nivanova/samba-autobuild/.git] / source / rpc_server / srv_lsa_nt.c
index b16e3836f6102d67864da838b3f68f64c8c795c0..84ab44bc30d019b2b1607cc78ba6a71e0d51fc28 100644 (file)
@@ -1,6 +1,5 @@
 /* 
- *  Unix SMB/Netbios implementation.
- *  Version 1.9.
+ *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
  *  Copyright (C) Andrew Tridgell              1992-1997,
  *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
@@ -36,6 +35,13 @@ struct lsa_info {
     uint32 access;
 };
 
+struct generic_mapping lsa_generic_mapping = {
+       POLICY_READ,
+       POLICY_WRITE,
+       POLICY_EXECUTE,
+       POLICY_ALL_ACCESS
+};
+
 /*******************************************************************
  Function to free the per handle data.
  ********************************************************************/
@@ -133,6 +139,8 @@ static void init_lsa_rid2s(DOM_R_REF *ref, DOM_RID2 *rid2,
 
        SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS);
 
+       become_root(); /* lookup_name can require root privs */
+
        for (i = 0; i < num_entries; i++) {
                BOOL status = False;
                DOM_SID sid;
@@ -151,7 +159,7 @@ static void init_lsa_rid2s(DOM_R_REF *ref, DOM_RID2 *rid2,
 
                DEBUG(5, ("init_lsa_rid2s: looking up name %s\n", full_name));
 
-               status = lookup_name(full_name, &sid, &name_type);
+               status = lookup_name(dom_name, user, &sid, &name_type);
 
                DEBUG(5, ("init_lsa_rid2s: %s\n", status ? "found" : 
                          "not found"));
@@ -169,6 +177,8 @@ static void init_lsa_rid2s(DOM_R_REF *ref, DOM_RID2 *rid2,
                init_dom_rid2(&rid2[total], rid, name_type, dom_idx);
                total++;
        }
+
+       unbecome_root();
 }
 
 /***************************************************************************
@@ -223,6 +233,8 @@ static void init_lsa_trans_names(TALLOC_CTX *ctx, DOM_R_REF *ref, LSA_TRANS_NAME
                }
        }
 
+       become_root(); /* Need root to get to passdb to for local sids */
+
        for (i = 0; i < num_entries; i++) {
                BOOL status = False;
                DOM_SID find_sid = sid[i].sid;
@@ -266,6 +278,8 @@ static void init_lsa_trans_names(TALLOC_CTX *ctx, DOM_R_REF *ref, LSA_TRANS_NAME
                total++;
        }
 
+       unbecome_root();
+
        trn->num_entries = total;
        trn->ptr_trans_names = 1;
        trn->num_entries2 = total;
@@ -290,16 +304,73 @@ static void init_reply_lookup_sids(LSA_R_LOOKUP_SIDS *r_l,
                r_l->status = NT_STATUS_OK;
 }
 
+static NTSTATUS lsa_get_generic_sd(TALLOC_CTX *mem_ctx, SEC_DESC **sd, size_t *sd_size)
+{
+       extern DOM_SID global_sid_World;
+       extern DOM_SID global_sid_Builtin;
+       DOM_SID local_adm_sid;
+       DOM_SID adm_sid;
+
+       SEC_ACE ace[3];
+       SEC_ACCESS mask;
+
+       SEC_ACL *psa = NULL;
+
+       init_sec_access(&mask, POLICY_EXECUTE);
+       init_sec_ace(&ace[0], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
+       sid_copy(&adm_sid, &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);
+
+       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((psa = make_sec_acl(mem_ctx, NT4_ACL_REVISION, 3, ace)) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       if((*sd = make_sec_desc(mem_ctx, SEC_DESC_REVISION, &adm_sid, NULL, NULL, psa, sd_size)) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       return NT_STATUS_OK;
+}
+
 /***************************************************************************
  _lsa_open_policy2.
  ***************************************************************************/
 
 NTSTATUS _lsa_open_policy2(pipes_struct *p, LSA_Q_OPEN_POL2 *q_u, LSA_R_OPEN_POL2 *r_u)
 {
-       /* lkclXXXX having decoded it, ignore all fields in the open policy! */
+       struct lsa_info *info;
+       SEC_DESC *psd = NULL;
+       size_t sd_size;
+       uint32 des_access=q_u->des_access;
+       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))
+               return status;
+
+       /* associate the domain SID with the (unique) handle. */
+       if ((info = (struct lsa_info *)malloc(sizeof(struct lsa_info))) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       ZERO_STRUCTP(info);
+       info->sid = global_sam_sid;
+       info->access = acc_granted;
 
        /* set up the LSA QUERY INFO response */
-       if (!create_policy_hnd(p, &r_u->pol, NULL, NULL))
+       if (!create_policy_hnd(p, &r_u->pol, free_lsa_info, (void *)info))
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 
        return NT_STATUS_OK;
@@ -311,10 +382,33 @@ NTSTATUS _lsa_open_policy2(pipes_struct *p, LSA_Q_OPEN_POL2 *q_u, LSA_R_OPEN_POL
 
 NTSTATUS _lsa_open_policy(pipes_struct *p, LSA_Q_OPEN_POL *q_u, LSA_R_OPEN_POL *r_u)
 {
-       /* lkclXXXX having decoded it, ignore all fields in the open policy! */
+       struct lsa_info *info;
+       SEC_DESC *psd = NULL;
+       size_t sd_size;
+       uint32 des_access=q_u->des_access;
+       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))
+               return status;
+
+       /* associate the domain SID with the (unique) handle. */
+       if ((info = (struct lsa_info *)malloc(sizeof(struct lsa_info))) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       ZERO_STRUCTP(info);
+       info->sid = global_sam_sid;
+       info->access = acc_granted;
 
        /* set up the LSA QUERY INFO response */
-       if (!create_policy_hnd(p, &r_u->pol, NULL, NULL))
+       if (!create_policy_hnd(p, &r_u->pol, free_lsa_info, (void *)info))
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 
        return NT_STATUS_OK;
@@ -326,13 +420,18 @@ NTSTATUS _lsa_open_policy(pipes_struct *p, LSA_Q_OPEN_POL *q_u, LSA_R_OPEN_POL *
 
 NTSTATUS _lsa_enum_trust_dom(pipes_struct *p, LSA_Q_ENUM_TRUST_DOM *q_u, LSA_R_ENUM_TRUST_DOM *r_u)
 {
+       struct lsa_info *info;
        uint32 enum_context = 0;
        char *dom_name = NULL;
        DOM_SID *dom_sid = NULL;
 
-       if (!find_policy_by_hnd(p, &q_u->pol, NULL))
+       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
                return NT_STATUS_INVALID_HANDLE;
 
+       /* check if the user have enough rights */
+       if (!(info->access & POLICY_VIEW_LOCAL_INFORMATION))
+               return NT_STATUS_ACCESS_DENIED;
+
        /* set up the LSA QUERY INFO response */
        init_r_enum_trust_dom(p->mem_ctx, r_u, enum_context, dom_name, dom_sid,
              dom_name != NULL ? NT_STATUS_OK : NT_STATUS_NO_MORE_ENTRIES);
@@ -346,6 +445,7 @@ NTSTATUS _lsa_enum_trust_dom(pipes_struct *p, LSA_Q_ENUM_TRUST_DOM *q_u, LSA_R_E
 
 NTSTATUS _lsa_query_info(pipes_struct *p, LSA_Q_QUERY_INFO *q_u, LSA_R_QUERY_INFO *r_u)
 {
+       struct lsa_info *handle;
        LSA_INFO_UNION *info = &r_u->dom;
        DOM_SID domain_sid;
        char *name = NULL;
@@ -353,24 +453,32 @@ NTSTATUS _lsa_query_info(pipes_struct *p, LSA_Q_QUERY_INFO *q_u, LSA_R_QUERY_INF
 
        r_u->status = NT_STATUS_OK;
 
-       if (!find_policy_by_hnd(p, &q_u->pol, NULL))
+       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&handle))
                return NT_STATUS_INVALID_HANDLE;
 
        switch (q_u->info_class) {
        case 0x02:
                {
-                       unsigned int i;
-                       /* fake info: We audit everything. ;) */
-                       info->id2.auditing_enabled = 1;
-            info->id2.count1 = 7;
-            info->id2.count2 = 7;
-                       if ((info->id2.auditsettings = (uint32 *)talloc(p->mem_ctx,7*sizeof(uint32))) == NULL)
-                               return NT_STATUS_NO_MEMORY;
-            for (i = 0; i < 7; i++)
-                info->id2.auditsettings[i] = 3;
-            break;
+               unsigned int i;
+               /* check if the user have enough rights */
+               if (!(handle->access & POLICY_VIEW_AUDIT_INFORMATION))
+                       return NT_STATUS_ACCESS_DENIED;
+
+               /* fake info: We audit everything. ;) */
+               info->id2.auditing_enabled = 1;
+               info->id2.count1 = 7;
+               info->id2.count2 = 7;
+               if ((info->id2.auditsettings = (uint32 *)talloc(p->mem_ctx,7*sizeof(uint32))) == NULL)
+                       return NT_STATUS_NO_MEMORY;
+               for (i = 0; i < 7; i++)
+                       info->id2.auditsettings[i] = 3;
+               break;
                }
        case 0x03:
+               /* 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:
@@ -389,7 +497,7 @@ NTSTATUS _lsa_query_info(pipes_struct *p, LSA_Q_QUERY_INFO *q_u, LSA_R_QUERY_INF
                                break;
                        case ROLE_STANDALONE:
                                name = global_myworkgroup;
-                               sid = NULL; /* Tell it we're not in a domain. */
+                               sid = NULL;
                                break;
                        default:
                                return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
@@ -397,6 +505,10 @@ NTSTATUS _lsa_query_info(pipes_struct *p, LSA_Q_QUERY_INFO *q_u, LSA_R_QUERY_INF
                init_dom_query(&r_u->dom.id3, name, sid);
                break;
        case 0x05:
+               /* check if the user have enough rights */
+               if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
+                       return NT_STATUS_ACCESS_DENIED;
+
                /* Request PolicyAccountDomainInformation. */
                switch (lp_server_role()) {
                        case ROLE_DOMAIN_PDC:
@@ -405,11 +517,11 @@ NTSTATUS _lsa_query_info(pipes_struct *p, LSA_Q_QUERY_INFO *q_u, LSA_R_QUERY_INF
                                sid = &global_sam_sid;
                                break;
                        case ROLE_DOMAIN_MEMBER:
-                               name = global_myworkgroup;
+                               name = global_myname;
                                sid = &global_sam_sid;
                                break;
                        case ROLE_STANDALONE:
-                               name = global_myworkgroup;
+                               name = global_myname;
                                sid = &global_sam_sid;
                                break;
                        default:
@@ -418,6 +530,10 @@ NTSTATUS _lsa_query_info(pipes_struct *p, LSA_Q_QUERY_INFO *q_u, LSA_R_QUERY_INF
                init_dom_query(&r_u->dom.id5, name, sid);
                break;
        case 0x06:
+               /* check if the user have enough rights */
+               if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
+                       return NT_STATUS_ACCESS_DENIED;
+
                switch (lp_server_role()) {
                        case ROLE_DOMAIN_BDC:
                                /*
@@ -455,21 +571,31 @@ NTSTATUS _lsa_query_info(pipes_struct *p, LSA_Q_QUERY_INFO *q_u, LSA_R_QUERY_INF
 
 NTSTATUS _lsa_lookup_sids(pipes_struct *p, LSA_Q_LOOKUP_SIDS *q_u, LSA_R_LOOKUP_SIDS *r_u)
 {
+       struct lsa_info *handle;
        DOM_SID2 *sid = q_u->sids.sid;
        int num_entries = q_u->sids.num_entries;
        DOM_R_REF *ref = NULL;
        LSA_TRANS_NAME_ENUM *names = NULL;
        uint32 mapped_count = 0;
 
-       if (!find_policy_by_hnd(p, &q_u->pol, NULL))
-               return NT_STATUS_INVALID_HANDLE;
-
        ref = (DOM_R_REF *)talloc_zero(p->mem_ctx, sizeof(DOM_R_REF));
        names = (LSA_TRANS_NAME_ENUM *)talloc_zero(p->mem_ctx, sizeof(LSA_TRANS_NAME_ENUM));
 
+       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&handle)) {
+               r_u->status = NT_STATUS_INVALID_HANDLE;
+               goto done;
+       }
+
+       /* check if the user have enough rights */
+       if (!(handle->access & POLICY_LOOKUP_NAMES)) {
+               r_u->status = NT_STATUS_ACCESS_DENIED;
+               goto done;
+       }
        if (!ref || !names)
                return NT_STATUS_NO_MEMORY;
 
+done:
+
        /* set up the LSA Lookup SIDs response */
        init_lsa_trans_names(p->mem_ctx, ref, names, num_entries, sid, &mapped_count);
        init_reply_lookup_sids(r_u, ref, names, mapped_count);
@@ -483,21 +609,37 @@ lsa_reply_lookup_names
 
 NTSTATUS _lsa_lookup_names(pipes_struct *p,LSA_Q_LOOKUP_NAMES *q_u, LSA_R_LOOKUP_NAMES *r_u)
 {
+       struct lsa_info *handle;
        UNISTR2 *names = q_u->uni_name;
        int num_entries = q_u->num_entries;
        DOM_R_REF *ref;
        DOM_RID2 *rids;
        uint32 mapped_count = 0;
 
-       if (!find_policy_by_hnd(p, &q_u->pol, NULL))
-               return NT_STATUS_INVALID_HANDLE;
-
+       if (num_entries >  MAX_LOOKUP_SIDS) {
+               num_entries = MAX_LOOKUP_SIDS;
+               DEBUG(5,("_lsa_lookup_names: truncating name lookup list to %d\n", num_entries));
+       }
+               
        ref = (DOM_R_REF *)talloc_zero(p->mem_ctx, sizeof(DOM_R_REF));
-       rids = (DOM_RID2 *)talloc_zero(p->mem_ctx, sizeof(DOM_RID2)*MAX_LOOKUP_SIDS);
+       rids = (DOM_RID2 *)talloc_zero(p->mem_ctx, sizeof(DOM_RID2)*num_entries);
+
+       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&handle)) {
+               r_u->status = NT_STATUS_INVALID_HANDLE;
+               goto done;
+       }
+
+       /* check if the user have enough rights */
+       if (!(handle->access & POLICY_LOOKUP_NAMES)) {
+               r_u->status = NT_STATUS_ACCESS_DENIED;
+               goto done;
+       }
 
        if (!ref || !rids)
                return NT_STATUS_NO_MEMORY;
 
+done:
+
        /* set up the LSA Lookup RIDs response */
        init_lsa_rid2s(ref, rids, num_entries, names, &mapped_count, p->endian);
        init_reply_lookup_names(r_u, ref, num_entries, rids, mapped_count);
@@ -533,15 +675,13 @@ _lsa_enum_privs.
 
 NTSTATUS _lsa_enum_privs(pipes_struct *p, LSA_Q_ENUM_PRIVS *q_u, LSA_R_ENUM_PRIVS *r_u)
 {
+       struct lsa_info *handle;
        uint32 i;
 
        uint32 enum_context=q_u->enum_context;
        LSA_PRIV_ENTRY *entry;
        LSA_PRIV_ENTRY *entries=NULL;
 
-       if (!find_policy_by_hnd(p, &q_u->pol, NULL))
-               return NT_STATUS_INVALID_HANDLE;
-
        if (enum_context >= PRIV_ALL_INDEX)
                return NT_STATUS_NO_MORE_ENTRIES;
 
@@ -549,6 +689,17 @@ NTSTATUS _lsa_enum_privs(pipes_struct *p, LSA_Q_ENUM_PRIVS *q_u, LSA_R_ENUM_PRIV
        if (entries==NULL)
                return NT_STATUS_NO_MEMORY;
 
+       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&handle))
+               return NT_STATUS_INVALID_HANDLE;
+
+       /* check if the user have enough rights */
+
+       /*
+        * I don't know if it's the right one. not documented.
+        */
+       if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
+               return NT_STATUS_ACCESS_DENIED;
+
        entry = entries;
        
        DEBUG(10,("_lsa_enum_privs: enum_context:%d total entries:%d\n", enum_context, PRIV_ALL_INDEX));
@@ -579,12 +730,21 @@ _lsa_priv_get_dispname.
 
 NTSTATUS _lsa_priv_get_dispname(pipes_struct *p, LSA_Q_PRIV_GET_DISPNAME *q_u, LSA_R_PRIV_GET_DISPNAME *r_u)
 {
+       struct lsa_info *handle;
        fstring name_asc;
        int i=1;
 
-       if (!find_policy_by_hnd(p, &q_u->pol, NULL))
+       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&handle))
                return NT_STATUS_INVALID_HANDLE;
 
+       /* check if the user have enough rights */
+
+       /*
+        * I don't know if it's the right one. not documented.
+        */
+       if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
+               return NT_STATUS_ACCESS_DENIED;
+
        unistr2_to_ascii(name_asc, &q_u->name, sizeof(name_asc));
 
        DEBUG(10,("_lsa_priv_get_dispname: %s", name_asc));
@@ -613,16 +773,25 @@ _lsa_enum_accounts.
 
 NTSTATUS _lsa_enum_accounts(pipes_struct *p, LSA_Q_ENUM_ACCOUNTS *q_u, LSA_R_ENUM_ACCOUNTS *r_u)
 {
+       struct lsa_info *handle;
        GROUP_MAP *map=NULL;
        int num_entries=0;
        LSA_SID_ENUM *sids=&r_u->sids;
        int i=0,j=0;
 
-       if (!find_policy_by_hnd(p, &q_u->pol, NULL))
+       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&handle))
                return NT_STATUS_INVALID_HANDLE;
 
+       /* check if the user have enough rights */
+
+       /*
+        * I don't know if it's the right one. not documented.
+        */
+       if (!(handle->access & POLICY_VIEW_LOCAL_INFORMATION))
+               return NT_STATUS_ACCESS_DENIED;
+
        /* get the list of mapped groups (domain, local, builtin) */
-       if(!enum_group_mapping(SID_NAME_UNKNOWN, &map, &num_entries, ENUM_ONLY_MAPPED))
+       if(!enum_group_mapping(SID_NAME_UNKNOWN, &map, &num_entries, ENUM_ONLY_MAPPED, MAPPING_WITHOUT_PRIV))
                return NT_STATUS_OK;
 
        if (q_u->enum_context >= num_entries)
@@ -652,32 +821,32 @@ NTSTATUS _lsa_enum_accounts(pipes_struct *p, LSA_Q_ENUM_ACCOUNTS *q_u, LSA_R_ENU
 
 NTSTATUS _lsa_unk_get_connuser(pipes_struct *p, LSA_Q_UNK_GET_CONNUSER *q_u, LSA_R_UNK_GET_CONNUSER *r_u)
 {
-  fstring username, domname;
-  int ulen, dlen;
-  user_struct *vuser = get_valid_user_struct(p->vuid);
+       fstring username, domname;
+       int ulen, dlen;
+       user_struct *vuser = get_valid_user_struct(p->vuid);
   
-  if (vuser == NULL)
-    return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+       if (vuser == NULL)
+               return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
   
-  fstrcpy(username, vuser->user.smb_name);
-  fstrcpy(domname, vuser->user.domain);
+       fstrcpy(username, vuser->user.smb_name);
+       fstrcpy(domname, vuser->user.domain);
   
-  ulen = strlen(username) + 1;
-  dlen = strlen(domname) + 1;
+       ulen = strlen(username) + 1;
+       dlen = strlen(domname) + 1;
   
-  init_uni_hdr(&r_u->hdr_user_name, ulen);
-  r_u->ptr_user_name = 1;
-  init_unistr2(&r_u->uni2_user_name, username, ulen);
+       init_uni_hdr(&r_u->hdr_user_name, ulen);
+       r_u->ptr_user_name = 1;
+       init_unistr2(&r_u->uni2_user_name, username, ulen);
 
-  r_u->unk1 = 1;
+       r_u->unk1 = 1;
   
-  init_uni_hdr(&r_u->hdr_dom_name, dlen);
-  r_u->ptr_dom_name = 1;
-  init_unistr2(&r_u->uni2_dom_name, domname, dlen);
+       init_uni_hdr(&r_u->hdr_dom_name, dlen);
+       r_u->ptr_dom_name = 1;
+       init_unistr2(&r_u->uni2_dom_name, domname, dlen);
 
-  r_u->status = NT_STATUS_OK;
+       r_u->status = NT_STATUS_OK;
   
-  return r_u->status;
+       return r_u->status;
 }
 
 /***************************************************************************
@@ -686,14 +855,24 @@ NTSTATUS _lsa_unk_get_connuser(pipes_struct *p, LSA_Q_UNK_GET_CONNUSER *q_u, LSA
 
 NTSTATUS _lsa_open_account(pipes_struct *p, LSA_Q_OPENACCOUNT *q_u, LSA_R_OPENACCOUNT *r_u)
 {
+       struct lsa_info *handle;
        struct lsa_info *info;
 
        r_u->status = NT_STATUS_OK;
 
        /* find the connection policy handle. */
-       if (!find_policy_by_hnd(p, &q_u->pol, NULL))
+       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&handle))
                return NT_STATUS_INVALID_HANDLE;
 
+       /* check if the user have enough rights */
+
+       /*
+        * 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;
+
        /* associate the user/group SID with the (unique) handle. */
        if ((info = (struct lsa_info *)malloc(sizeof(struct lsa_info))) == NULL)
                return NT_STATUS_NO_MEMORY;
@@ -727,7 +906,7 @@ NTSTATUS _lsa_enum_privsaccount(pipes_struct *p, LSA_Q_ENUMPRIVSACCOUNT *q_u, LS
        if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       if (!get_group_map_from_sid(info->sid, &map))
+       if (!get_group_map_from_sid(info->sid, &map, MAPPING_WITH_PRIV))
                return NT_STATUS_NO_SUCH_GROUP;
 
        DEBUG(10,("_lsa_enum_privsaccount: %d privileges\n", map.priv_set.count));
@@ -768,7 +947,7 @@ NTSTATUS _lsa_getsystemaccount(pipes_struct *p, LSA_Q_GETSYSTEMACCOUNT *q_u, LSA
        if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       if (!get_group_map_from_sid(info->sid, &map))
+       if (!get_group_map_from_sid(info->sid, &map, MAPPING_WITHOUT_PRIV))
                return NT_STATUS_NO_SUCH_GROUP;
 
        /*
@@ -799,7 +978,7 @@ NTSTATUS _lsa_setsystemaccount(pipes_struct *p, LSA_Q_SETSYSTEMACCOUNT *q_u, LSA
        if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       if (!get_group_map_from_sid(info->sid, &map))
+       if (!get_group_map_from_sid(info->sid, &map, MAPPING_WITH_PRIV))
                return NT_STATUS_NO_SUCH_GROUP;
 
        map.systemaccount=q_u->access;
@@ -807,6 +986,8 @@ NTSTATUS _lsa_setsystemaccount(pipes_struct *p, LSA_Q_SETSYSTEMACCOUNT *q_u, LSA
        if(!add_mapping_entry(&map, TDB_REPLACE))
                return NT_STATUS_NO_SUCH_GROUP;
 
+       free_privilege(&map.priv_set);
+
        return r_u->status;
 }
 
@@ -829,7 +1010,7 @@ NTSTATUS _lsa_addprivs(pipes_struct *p, LSA_Q_ADDPRIVS *q_u, LSA_R_ADDPRIVS *r_u
        if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       if (!get_group_map_from_sid(info->sid, &map))
+       if (!get_group_map_from_sid(info->sid, &map, MAPPING_WITH_PRIV))
                return NT_STATUS_NO_SUCH_GROUP;
 
        set=&q_u->set;
@@ -873,7 +1054,7 @@ NTSTATUS _lsa_removeprivs(pipes_struct *p, LSA_Q_REMOVEPRIVS *q_u, LSA_R_REMOVEP
        if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       if (!get_group_map_from_sid(info->sid, &map))
+       if (!get_group_map_from_sid(info->sid, &map, MAPPING_WITH_PRIV))
                return NT_STATUS_NO_SUCH_GROUP;
 
        if (q_u->allrights!=0) {
@@ -911,3 +1092,57 @@ NTSTATUS _lsa_removeprivs(pipes_struct *p, LSA_Q_REMOVEPRIVS *q_u, LSA_R_REMOVEP
        return r_u->status;
 }
 
+/***************************************************************************
+ For a given SID, remove some privileges.
+ ***************************************************************************/
+
+NTSTATUS _lsa_query_secobj(pipes_struct *p, LSA_Q_QUERY_SEC_OBJ *q_u, LSA_R_QUERY_SEC_OBJ *r_u)
+{
+       struct lsa_info *handle=NULL;
+       SEC_DESC *psd = NULL;
+       size_t sd_size;
+       NTSTATUS status;
+
+       r_u->status = NT_STATUS_OK;
+
+       /* find the connection policy handle. */
+       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&handle))
+               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 (q_u->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((r_u->buf = make_sec_desc_buf(p->mem_ctx, sd_size, psd)) == NULL)
+                       return NT_STATUS_NO_MEMORY;
+               break;
+       case 4:
+               /* SD contains only the ACL */
+
+               status=lsa_get_generic_sd(p->mem_ctx, &psd, &sd_size);
+               if(!NT_STATUS_IS_OK(status))
+                       return NT_STATUS_NO_MEMORY;
+
+               if((r_u->buf = make_sec_desc_buf(p->mem_ctx, sd_size, psd)) == NULL)
+                       return NT_STATUS_NO_MEMORY;
+               break;
+       default:
+               return NT_STATUS_INVALID_LEVEL;
+       }
+
+       r_u->ptr=1;
+
+       return r_u->status;
+}
+
+