*id_to_*id call reshape to return NTSTATUS errors
[ira/wip.git] / source3 / rpc_server / srv_samr_nt.c
index 7e48d743596a41c6e1fca9ac7cc9540663d70449..69ac60a7db0c04b3c737e78bb37ad5b5f9444d52 100644 (file)
@@ -1,12 +1,14 @@
 /*
- *  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,
- *  Copyright (C) Paul Ashton                       1997.
- *  Copyright (C) Marc Jacobsen                            1999.
- *  Copyright (C) Jeremy Allison                    2001.
+ *  Copyright (C) Paul Ashton                       1997,
+ *  Copyright (C) Marc Jacobsen                            1999,
+ *  Copyright (C) Jeremy Allison               2001-2002,
+ *  Copyright (C) Jean François Micouleau      1998-2001,
+ *  Copyright (C) Anthony Liguori                   2002,
+ *  Copyright (C) Jim McDonough                     2002.
  *
  *  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
 
 #include "includes.h"
 
-extern fstring global_myworkgroup;
-extern pstring global_myname;
-extern DOM_SID global_sam_sid;
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_SRV
+
 extern DOM_SID global_sid_Builtin;
 
 extern rid_name domain_group_rids[];
 extern rid_name domain_alias_rids[];
 extern rid_name builtin_alias_rids[];
 
+
+typedef struct _disp_info {
+       BOOL user_dbloaded;
+       uint32 num_user_account;
+       DISP_USER_INFO *disp_user_info;
+       BOOL group_dbloaded;
+       uint32 num_group_account;
+       DISP_GROUP_INFO *disp_group_info;
+} DISP_INFO;
+
 struct samr_info {
-    /* for use by the \PIPE\samr policy */
-    DOM_SID sid;
-    uint32 status; /* some sort of flag.  best to record it.  comes from opnum 0x39 */
+       /* for use by the \PIPE\samr policy */
+       DOM_SID sid;
+       uint32 status; /* some sort of flag.  best to record it.  comes from opnum 0x39 */
+       uint32 acc_granted;
+       uint16 acb_mask;
+       BOOL all_machines;
+       DISP_INFO disp_info;
+
+       TALLOC_CTX *mem_ctx;
 };
 
-/*******************************************************************
- Function to free the per handle data.
- ********************************************************************/
+struct generic_mapping sam_generic_mapping = {GENERIC_RIGHTS_SAM_READ, GENERIC_RIGHTS_SAM_WRITE, GENERIC_RIGHTS_SAM_EXECUTE, GENERIC_RIGHTS_SAM_ALL_ACCESS};
+struct generic_mapping dom_generic_mapping = {GENERIC_RIGHTS_DOMAIN_READ, GENERIC_RIGHTS_DOMAIN_WRITE, GENERIC_RIGHTS_DOMAIN_EXECUTE, GENERIC_RIGHTS_DOMAIN_ALL_ACCESS};
+struct generic_mapping usr_generic_mapping = {GENERIC_RIGHTS_USER_READ, GENERIC_RIGHTS_USER_WRITE, GENERIC_RIGHTS_USER_EXECUTE, GENERIC_RIGHTS_USER_ALL_ACCESS};
+struct generic_mapping grp_generic_mapping = {GENERIC_RIGHTS_GROUP_READ, GENERIC_RIGHTS_GROUP_WRITE, GENERIC_RIGHTS_GROUP_EXECUTE, GENERIC_RIGHTS_GROUP_ALL_ACCESS};
+struct generic_mapping ali_generic_mapping = {GENERIC_RIGHTS_ALIAS_READ, GENERIC_RIGHTS_ALIAS_WRITE, GENERIC_RIGHTS_ALIAS_EXECUTE, GENERIC_RIGHTS_ALIAS_ALL_ACCESS};
 
-static void free_samr_info(void *ptr)
-{
-       SAFE_FREE(ptr);
-}
+static NTSTATUS samr_make_dom_obj_sd(TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size);
 
 /*******************************************************************
- Ensure password info is never given out. Paranioa... JRA.
- ********************************************************************/
+ Checks if access to an object should be granted, and returns that
+ level of access for further checks.
+********************************************************************/
 
-static void samr_clear_passwd_fields( SAM_USER_INFO_21 *pass, int num_entries)
+NTSTATUS access_check_samr_object(SEC_DESC *psd, NT_USER_TOKEN *nt_user_token, uint32 des_access, 
+                                 uint32 *acc_granted, const char *debug) 
 {
-       int i;
-
-       if (!pass)
-               return;
-
-       for (i = 0; i < num_entries; i++) {
-               memset(&pass[i].lm_pwd, '\0', sizeof(pass[i].lm_pwd));
-               memset(&pass[i].nt_pwd, '\0', sizeof(pass[i].nt_pwd));
+       NTSTATUS status = NT_STATUS_ACCESS_DENIED;
+
+       if (!se_access_check(psd, nt_user_token, des_access, acc_granted, &status)) {
+               *acc_granted = des_access;
+               if (geteuid() == sec_initial_uid()) {
+                       DEBUG(4,("%s: ACCESS should be DENIED  (requested: %#010x)\n",
+                               debug, des_access));
+                       DEBUGADD(4,("but overritten by euid == sec_initial_uid()\n"));
+                       status = NT_STATUS_OK;
+               }
+               else {
+                       DEBUG(2,("%s: ACCESS DENIED  (requested: %#010x)\n",
+                               debug, des_access));
+               }
        }
-}
-
-static void samr_clear_sam_passwd(SAM_ACCOUNT *sam_pass)
-{
-       if (!sam_pass)
-               return;
-
-       if (sam_pass->lm_pw) memset(sam_pass->lm_pw, '\0', 16);
-       if (sam_pass->nt_pw) memset(sam_pass->nt_pw, '\0', 16);
+       return status;
 }
 
 /*******************************************************************
-  This next function should be replaced with something that
-  dynamically returns the correct user info..... JRA.
- ********************************************************************/
+ Checks if access to a function can be granted
+********************************************************************/
 
-static NTSTATUS get_sampwd_entries(SAM_USER_INFO_21 *pw_buf, int start_idx,
-                                int *total_entries, int *num_entries,
-                                int max_num_entries, uint16 acb_mask)
+NTSTATUS access_check_samr_function(uint32 acc_granted, uint32 acc_required, const char *debug)
 {
-       SAM_ACCOUNT *pwd = NULL;
-       BOOL not_finished = True;
-       (*num_entries) = 0;
-       (*total_entries) = 0;
-
-       if (pw_buf == NULL)
-               return NT_STATUS_NO_MEMORY;
-
-       pdb_init_sam(&pwd);
-
-       if (!pdb_setsampwent(False)) {
-               DEBUG(0, ("get_sampwd_entries: Unable to open passdb.\n"));
-               pdb_free_sam(&pwd);
-               return NT_STATUS_ACCESS_DENIED;
-       }
-       
-       while (((not_finished = pdb_getsampwent(pwd)) != False) 
-              && (*num_entries) < max_num_entries) 
-       {
-               int user_name_len;
-               
-               if (start_idx > 0) {
-
-                       pdb_reset_sam(pwd);
-
-                       /* skip the requested number of entries.
-                          not very efficient, but hey...  */
-                       start_idx--;
-                       continue;
-               }
-               
-               user_name_len = strlen(pdb_get_username(pwd))+1;
-               init_unistr2(&pw_buf[(*num_entries)].uni_user_name, pdb_get_username(pwd), user_name_len);
-               init_uni_hdr(&pw_buf[(*num_entries)].hdr_user_name, user_name_len);
-               pw_buf[(*num_entries)].user_rid = pwd->user_rid;
-               memset((char *)pw_buf[(*num_entries)].nt_pwd, '\0', 16);
-               
-               /* Now check if the NT compatible password is available. */
-               if (pdb_get_nt_passwd(pwd))
-                       memcpy( pw_buf[(*num_entries)].nt_pwd , pdb_get_nt_passwd(pwd), 16);
-               
-               pw_buf[(*num_entries)].acb_info = pdb_get_acct_ctrl(pwd);
-               
-               DEBUG(5, ("entry idx: %d user %s, rid 0x%x, acb %x",
-                         (*num_entries), pdb_get_username(pwd), pdb_get_user_rid(pwd), pdb_get_acct_ctrl(pwd) ));
-               
-               if (acb_mask == 0 || (pwd->acct_ctrl & acb_mask)) {
-                       DEBUG(5,(" acb_mask %x accepts\n", acb_mask));
-                       (*num_entries)++;
-               } else {
-                       DEBUG(5,(" acb_mask %x rejects\n", acb_mask));
+       DEBUG(5,("%s: access check ((granted: %#010x;  required: %#010x)\n",
+                       debug, acc_granted, acc_required));
+       if ((acc_granted & acc_required) != acc_required) {
+               if (geteuid() == sec_initial_uid()) {
+                       DEBUG(4,("%s: ACCESS should be DENIED (granted: %#010x;  required: %#010x)\n",
+                               debug, acc_granted, acc_required));
+                       DEBUGADD(4,("but overwritten by euid == 0\n"));
+                       return NT_STATUS_OK;
                }
-
-               (*total_entries)++;
-               
-               pdb_reset_sam(pwd);
-
+               DEBUG(2,("%s: ACCESS DENIED (granted: %#010x;  required: %#010x)\n",
+                       debug, acc_granted, acc_required));
+               return NT_STATUS_ACCESS_DENIED;
        }
-       
-       pdb_endsampwent();
-       pdb_free_sam(&pwd);
-
-       if (not_finished)
-               return STATUS_MORE_ENTRIES;
-       else
-               return NT_STATUS_OK;
+       return NT_STATUS_OK;
 }
 
-static NTSTATUS jf_get_sampwd_entries(SAM_USER_INFO_21 *pw_buf, int start_idx,
-                                int *total_entries, uint32 *num_entries,
-                                int max_num_entries, uint16 acb_mask)
-{
-       SAM_ACCOUNT *pwd = NULL;
-       BOOL not_finished = True;
 
-       *num_entries = 0;
-       *total_entries = 0;
+/*******************************************************************
+ Create a samr_info struct.
+********************************************************************/
 
-       if (pw_buf == NULL)
-               return NT_STATUS_NO_MEMORY;
+static struct samr_info *get_samr_info_by_sid(DOM_SID *psid)
+{
+       struct samr_info *info;
+       fstring sid_str;
+       TALLOC_CTX *mem_ctx;
        
-       DEBUG(10,("jf_get_sampwd_entries: start index:%d, max entries:%d, mask:%d\n", 
-               start_idx, max_num_entries, acb_mask));
-
-       if (!pdb_setsampwent(False)) {
-               DEBUG(0, ("jf_get_sampwd_entries: Unable to open passdb.\n"));
-               return NT_STATUS_ACCESS_DENIED;
+       if (psid) {
+               sid_to_string(sid_str, psid);
+       } else {
+               fstrcpy(sid_str,"(NULL)");
        }
 
-       pdb_init_sam(&pwd);
-
-       while (((not_finished = pdb_getsampwent(pwd)) != False) && (*num_entries) < max_num_entries) {
-               int user_name_len;
-               int full_name_len;
+       mem_ctx = talloc_init("samr_info for domain sid %s", sid_str);
 
-               if (acb_mask != 0 && !(pdb_get_acct_ctrl(pwd) & acb_mask)) {
-                       pdb_reset_sam(pwd);
-                       continue;
-               }
-
-               if (start_idx > 0) {
-                       /* skip the requested number of entries.
-                          not very efficient, but hey...
-                       */
-                       start_idx--;
-                       pdb_reset_sam(pwd);
-                       continue;
-               }
-
-               ZERO_STRUCTP(&pw_buf[(*num_entries)]);
-
-               user_name_len = strlen(pdb_get_username(pwd));
-               init_unistr2(&pw_buf[(*num_entries)].uni_user_name, pdb_get_username(pwd), user_name_len);
-               init_uni_hdr(&pw_buf[(*num_entries)].hdr_user_name, user_name_len);
-
-               full_name_len = strlen(pdb_get_fullname(pwd));
-               init_unistr2(&pw_buf[(*num_entries)].uni_full_name, pdb_get_fullname(pwd), full_name_len);
-               init_uni_hdr(&pw_buf[(*num_entries)].hdr_full_name, full_name_len);
-
-               pw_buf[(*num_entries)].user_rid = pdb_get_user_rid(pwd);
-               memset((char *)pw_buf[(*num_entries)].nt_pwd, '\0', 16);
-
-               /* Now check if the NT compatible password is available. */
-               if (pdb_get_nt_passwd(pwd))
-                       memcpy( pw_buf[(*num_entries)].nt_pwd , pdb_get_nt_passwd(pwd), 16);
-
-               pw_buf[(*num_entries)].acb_info = pdb_get_acct_ctrl(pwd);
-
-               DEBUG(5, ("entry idx: %d user %s, rid 0x%x, acb %x\n", (*num_entries),
-                  pdb_get_username(pwd), pdb_get_user_rid(pwd), pdb_get_acct_ctrl(pwd) ));
+       if ((info = (struct samr_info *)talloc(mem_ctx, sizeof(struct samr_info))) == NULL)
+               return NULL;
 
-               (*num_entries)++;
-               
-               pdb_reset_sam(pwd);
+       ZERO_STRUCTP(info);
+       DEBUG(10,("get_samr_info_by_sid: created new info for sid %s\n", sid_str));
+       if (psid) {
+               sid_copy( &info->sid, psid);
+       } else {
+               DEBUG(10,("get_samr_info_by_sid: created new info for NULL sid.\n"));
        }
-
-       pdb_endsampwent();
-
-       *total_entries = *num_entries;
-       
-       pdb_free_sam(&pwd);
-
-       if (not_finished)
-               return STATUS_MORE_ENTRIES;
-       else
-               return NT_STATUS_OK;
+       info->mem_ctx = mem_ctx;
+       return info;
 }
 
-#if 0 /* This function appears to be unused! */
 
 /*******************************************************************
- This function uses the username map file and tries to map a UNIX
- user name to an DOS name.  (Sort of the reverse of the
- map_username() function.)  Since more than one DOS name can map
- to the UNIX name, to reverse the mapping you have to specify
- which corresponding DOS name you want; that's where the name_idx
- parameter comes in.  Returns the string requested or NULL if it
- fails or can't complete the request for any reason.  This doesn't
- handle group names (starting with '@') or names starting with
- '+' or '&'.  If they are encountered, they are skipped.
-********************************************************************/
-
-static char *unmap_unixname(char *unix_user_name, int name_idx)
+ Function to free the per handle data.
+ ********************************************************************/
+static void free_samr_users(struct samr_info *info) 
 {
-       char *mapfile = lp_username_map();
-       char **lines;
-       static pstring tok;
        int i;
 
-       if (!*unix_user_name) return NULL;
-       if (!*mapfile) return NULL;
-
-       lines = file_lines_load(mapfile, NULL);
-       if (!lines) {
-               DEBUG(0,("unmap_unixname: can't open username map %s\n", mapfile));
-               return NULL;
+       if (info->disp_info.user_dbloaded){
+               for (i=0; i<info->disp_info.num_user_account; i++) {
+                       /* Not really a free, actually a 'clear' */
+                       pdb_free_sam(&info->disp_info.disp_user_info[i].sam);
+               }
        }
+       info->disp_info.user_dbloaded=False;
+       info->disp_info.num_user_account=0;
+}
 
-       DEBUG(5,("unmap_unixname: scanning username map %s, index: %d\n", mapfile, name_idx));
-
-       for (i=0; lines[i]; i++) {
-               char *unixname = lines[i];
-               char *dosname = strchr_m(unixname,'=');
-
-               if (!dosname)
-                       continue;
-
-               *dosname++ = 0;
 
-               while (isspace(*unixname))
-                       unixname++;
-               if ('!' == *unixname) {
-                       unixname++;
-                       while (*unixname && isspace(*unixname))
-                               unixname++;
-               }
-    
-               if (!*unixname || strchr_m("#;",*unixname))
-                       continue;
+/*******************************************************************
+ Function to free the per handle data.
+ ********************************************************************/
+static void free_samr_db(struct samr_info *info)
+{
+       /* Groups are talloced */
 
-               if (strncmp(unixname, unix_user_name, strlen(unix_user_name)))
-                       continue;
+       free_samr_users(info);
 
-               /* We have matched the UNIX user name */
+       info->disp_info.group_dbloaded=False;
+       info->disp_info.num_group_account=0;
+}
 
-               while(next_token(&dosname, tok, LIST_SEP, sizeof(tok))) {
-                       if (!strchr_m("@&+", *tok)) {
-                               name_idx--;
-                               if (name_idx < 0 ) {
-                                       break;
-                               }
-                       }
-               }
 
-               if (name_idx >= 0) {
-                       DEBUG(0,("unmap_unixname: index too high - not that many DOS names\n"));
-                       file_lines_free(lines);
-                       return NULL;
-               } else {
-                       file_lines_free(lines);
-                       return tok;
-               }
-       }
+static void free_samr_info(void *ptr)
+{
+       struct samr_info *info=(struct samr_info *) ptr;
 
-       DEBUG(0,("unmap_unixname: Couldn't find the UNIX user name\n"));
-       file_lines_free(lines);
-       return NULL;
+       free_samr_db(info);
+       talloc_destroy(info->mem_ctx);
 }
 
-#endif /* Unused function */
-
-#if 0 /* This function seems to be not used anywhere! */
-
 /*******************************************************************
- This function sets up a list of users taken from the list of
- users that UNIX knows about, as well as all the user names that
- Samba maps to a valid UNIX user name.  (This should work with
- /etc/passwd or NIS.)
-********************************************************************/
+ Ensure password info is never given out. Paranioa... JRA.
+ ********************************************************************/
 
-static BOOL get_passwd_entries(SAM_USER_INFO_21 *pw_buf,
-                               int start_idx,
-                               int *total_entries, int *num_entries,
-                               int max_num_entries,
-                               uint16 acb_mask)
+static void samr_clear_sam_passwd(SAM_ACCOUNT *sam_pass)
 {
-       static struct passwd *pwd = NULL;
-       static uint32 pw_rid;
-       static BOOL orig_done = False;
-       static int current_idx = 0;
-       static int mapped_idx = 0;
-       char *sep;
+       
+       if (!sam_pass)
+               return;
 
-       DEBUG(5, ("get_passwd_entries: retrieving a list of UNIX users\n"));
+       /* These now zero out the old password */
 
-       (*num_entries) = 0;
-       (*total_entries) = 0;
+       pdb_set_lanman_passwd(sam_pass, NULL, PDB_DEFAULT);
+       pdb_set_nt_passwd(sam_pass, NULL, PDB_DEFAULT);
+}
 
-       /* Skip all this stuff if we're in appliance mode */
 
-       if (lp_hide_local_users()) goto done;
+static NTSTATUS load_sampwd_entries(struct samr_info *info, uint16 acb_mask, BOOL all_machines)
+{
+       SAM_ACCOUNT *pwd = NULL;
+       DISP_USER_INFO *pwd_array = NULL;
+       NTSTATUS nt_status = NT_STATUS_OK;
+       TALLOC_CTX *mem_ctx = info->mem_ctx;
 
-       if (pw_buf == NULL) return False;
+       DEBUG(10,("load_sampwd_entries\n"));
 
-       if (current_idx == 0) {
-               sys_setpwent();
+       /* if the snapshoot is already loaded, return */
+       if ((info->disp_info.user_dbloaded==True) 
+           && (info->acb_mask == acb_mask) 
+           && (info->all_machines == all_machines)) {
+               DEBUG(10,("load_sampwd_entries: already in memory\n"));
+               return NT_STATUS_OK;
        }
 
-       /* These two cases are inefficient, but should be called very rarely */
-       /* they are the cases where the starting index isn't picking up      */
-       /* where we left off last time.  It is efficient when it starts over */
-       /* at zero though.                                                   */
-       if (start_idx > current_idx) {
-               /* We aren't far enough; advance to start_idx */
-               while (current_idx <= start_idx) {
-                       char *unmap_name;
+       free_samr_users(info);
 
-                       if(!orig_done) {
-                               if ((pwd = sys_getpwent()) == NULL) break;
-                               current_idx++;
-                               orig_done = True;
-                       }
+       if (!pdb_setsampwent(False)) {
+               DEBUG(0, ("load_sampwd_entries: Unable to open passdb.\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-                       while (((unmap_name = unmap_unixname(pwd->pw_name, mapped_idx)) != NULL) && 
-                               (current_idx < start_idx)) {
-                               current_idx++;
-                               mapped_idx++;
+       for (; (NT_STATUS_IS_OK(nt_status = pdb_init_sam_talloc(mem_ctx, &pwd))) 
+                    && pdb_getsampwent(pwd) == True; pwd=NULL) {
+               
+               if (all_machines) {
+                       if (!((pdb_get_acct_ctrl(pwd) & ACB_WSTRUST) 
+                             || (pdb_get_acct_ctrl(pwd) & ACB_SVRTRUST))) {
+                               DEBUG(5,("load_sampwd_entries: '%s' is not a machine account - ACB: %x - skipping\n", pdb_get_username(pwd), acb_mask));
+                               pdb_free_sam(&pwd);
+                               continue;
                        }
-
-                       if (unmap_name == NULL) {
-                               orig_done = False;
-                               mapped_idx = 0;
+               } else {
+                       if (acb_mask != 0 && !(pdb_get_acct_ctrl(pwd) & acb_mask)) {
+                               pdb_free_sam(&pwd);
+                               DEBUG(5,(" acb_mask %x reject\n", acb_mask));
+                               continue;
                        }
                }
-       } else if (start_idx < current_idx) {
-               /* We are already too far; start over and advance to start_idx */
-               sys_endpwent();
-               sys_setpwent();
-               current_idx = 0;
-               mapped_idx = 0;
-               orig_done = False;
-               while (current_idx < start_idx) {
-                       char *unmap_name;
-
-                       if(!orig_done) {
-                               if ((pwd = sys_getpwent()) == NULL) break;
-                               current_idx++;
-                               orig_done = True;
-                       }
 
-                       while (((unmap_name = unmap_unixname(pwd->pw_name, mapped_idx)) != NULL) && 
-                               (current_idx < start_idx)) {
-                               current_idx++;
-                               mapped_idx++;
-                       }
+               /* Realloc some memory for the array of ptr to the SAM_ACCOUNT structs */
+               if (info->disp_info.num_user_account % MAX_SAM_ENTRIES == 0) {
+               
+                       DEBUG(10,("load_sampwd_entries: allocating more memory\n"));
+                       pwd_array=(DISP_USER_INFO *)talloc_realloc(mem_ctx, info->disp_info.disp_user_info, 
+                                         (info->disp_info.num_user_account+MAX_SAM_ENTRIES)*sizeof(DISP_USER_INFO));
 
-                       if (unmap_name == NULL) {
-                               orig_done = False;
-                               mapped_idx = 0;
-                       }
+                       if (pwd_array==NULL)
+                               return NT_STATUS_NO_MEMORY;
+
+                       info->disp_info.disp_user_info=pwd_array;
                }
-       }
+       
+               /* link the SAM_ACCOUNT to the array */
+               info->disp_info.disp_user_info[info->disp_info.num_user_account].sam=pwd;
 
-       sep = lp_winbind_separator();
+               DEBUG(10,("load_sampwd_entries: entry: %d\n", info->disp_info.num_user_account));
 
-       /* now current_idx == start_idx */
-       while ((*num_entries) < max_num_entries) {
-               int user_name_len;
-               char *unmap_name;
+               info->disp_info.num_user_account++;     
+       }
 
-               /* This does the original UNIX user itself */
-               if(!orig_done) {
-                       if ((pwd = sys_getpwent()) == NULL) break;
+       pdb_endsampwent();
 
-                       /* Don't enumerate winbind users as they are not local */
+       /* the snapshoot is in memory, we're ready to enumerate fast */
 
-                       if (strchr_m(pwd->pw_name, *sep) != NULL) {
-                               continue;
-                       }
+       info->acb_mask = acb_mask;
+       info->all_machines = all_machines;
+       info->disp_info.user_dbloaded=True;
 
-                       user_name_len = strlen(pwd->pw_name);
-                       
-                       /* skip the trust account stored in the /etc/passwd file */
-                       if (pwd->pw_name[user_name_len-1]=='$')
-                               continue;
-                       
-                       pw_rid = pdb_uid_to_user_rid(pwd->pw_uid);
-                       ZERO_STRUCTP(&pw_buf[(*num_entries)]);
-                       init_unistr2(&pw_buf[(*num_entries)].uni_user_name, pwd->pw_name, user_name_len);
-                       init_uni_hdr(&pw_buf[(*num_entries)].hdr_user_name, user_name_len);
-                       pw_buf[(*num_entries)].user_rid = pw_rid;
-                       memset((char *)pw_buf[(*num_entries)].nt_pwd, '\0', 16);
+       DEBUG(10,("load_sampwd_entries: done\n"));
+
+       return nt_status;
+}
 
-                       pw_buf[(*num_entries)].acb_info = ACB_NORMAL;
+static NTSTATUS load_group_domain_entries(struct samr_info *info, DOM_SID *sid)
+{
+       GROUP_MAP *map=NULL;
+       DISP_GROUP_INFO *grp_array = NULL;
+       uint32 group_entries = 0;
+       uint32 i;
+       TALLOC_CTX *mem_ctx = info->mem_ctx;
 
-                       DEBUG(5, ("get_passwd_entries: entry idx %d user %s, rid 0x%x\n", (*num_entries), pwd->pw_name, pw_rid));
+       DEBUG(10,("load_group_domain_entries\n"));
 
-                       (*num_entries)++;
-                       (*total_entries)++;
-                       current_idx++;
-                       orig_done = True;
-               }
+       /* if the snapshoot is already loaded, return */
+       if (info->disp_info.group_dbloaded==True) {
+               DEBUG(10,("load_group_domain_entries: already in memory\n"));
+               return NT_STATUS_OK;
+       }
+       
 
-               /* This does all the user names that map to the UNIX user */
-               while (((unmap_name = unmap_unixname(pwd->pw_name, mapped_idx)) != NULL) && 
-                       (*num_entries < max_num_entries)) {
-                       user_name_len = strlen(unmap_name);
-                       ZERO_STRUCTP(&pw_buf[(*num_entries)]);
-                       init_unistr2(&pw_buf[(*num_entries)].uni_user_name, unmap_name, user_name_len);
-                       init_uni_hdr(&pw_buf[(*num_entries)].hdr_user_name, user_name_len);
-                       pw_buf[(*num_entries)].user_rid = pw_rid;
-                       memset((char *)pw_buf[(*num_entries)].nt_pwd, '\0', 16);
+       become_root();
 
-                       pw_buf[(*num_entries)].acb_info = ACB_NORMAL;
+       if (!pdb_enum_group_mapping(SID_NAME_DOM_GRP, &map, (int *)&group_entries, ENUM_ONLY_MAPPED, MAPPING_WITHOUT_PRIV)) {
+               DEBUG(1, ("load_group_domain_entries: pdb_enum_group_mapping() failed!\n"));
+               return NT_STATUS_NO_MEMORY;
+       }
+       
+       unbecome_root();
 
-                       DEBUG(5, ("get_passwd_entries: entry idx %d user %s, rid 0x%x\n", (*num_entries), pwd->pw_name, pw_rid));
+       info->disp_info.num_group_account=group_entries;
 
-                       (*num_entries)++;
-                       (*total_entries)++;
-                       current_idx++;
-                       mapped_idx++;
-               }
+       grp_array=(DISP_GROUP_INFO *)talloc(mem_ctx, info->disp_info.num_group_account*sizeof(DISP_GROUP_INFO));
 
-               if (unmap_name == NULL) {
-                       /* done with 'aliases', go on to next UNIX user */
-                       orig_done = False;
-                       mapped_idx = 0;
-               }
+       if (group_entries!=0 && grp_array==NULL) {
+               DEBUG(1, ("load_group_domain_entries: talloc() failed for grp_array!\n"));
+               SAFE_FREE(map);
+               return NT_STATUS_NO_MEMORY;
        }
 
-       if (pwd == NULL) {
-               /* totally done, reset everything */
-               sys_endpwent();
-               current_idx = 0;
-               mapped_idx = 0;
+       info->disp_info.disp_group_info=grp_array;
+
+       for (i=0; i<group_entries; i++) {
+       
+               grp_array[i].grp=(DOMAIN_GRP *)talloc(mem_ctx, sizeof(DOMAIN_GRP));
+       
+               fstrcpy(grp_array[i].grp->name, map[i].nt_name);
+               fstrcpy(grp_array[i].grp->comment, map[i].comment);
+               sid_split_rid(&map[i].sid, &grp_array[i].grp->rid);
+               grp_array[i].grp->attr=SID_NAME_DOM_GRP;
        }
 
-done:
-       return (*num_entries) > 0;
+       SAFE_FREE(map);
+
+       /* the snapshoot is in memory, we're ready to enumerate fast */
+
+       info->disp_info.group_dbloaded=True;
+
+       DEBUG(10,("load_group_domain_entries: done\n"));
+
+       return NT_STATUS_OK;
 }
 
-#endif /* Unused function */
 
 /*******************************************************************
  _samr_close_hnd
@@ -515,20 +368,37 @@ NTSTATUS _samr_close_hnd(pipes_struct *p, SAMR_Q_CLOSE_HND *q_u, SAMR_R_CLOSE_HN
 
 NTSTATUS _samr_open_domain(pipes_struct *p, SAMR_Q_OPEN_DOMAIN *q_u, SAMR_R_OPEN_DOMAIN *r_u)
 {
-       struct samr_info *info;
+       struct    samr_info *info;
+       SEC_DESC *psd = NULL;
+       uint32    acc_granted;
+       uint32    des_access = q_u->flags;
+       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, NULL))
+       if (!find_policy_by_hnd(p, &q_u->pol, (void**)&info))
                return NT_STATUS_INVALID_HANDLE;
 
+       if (!NT_STATUS_IS_OK(status = access_check_samr_function(info->acc_granted, SA_RIGHT_SAM_OPEN_DOMAIN,"_samr_open_domain"))) {
+               return status;
+       }
+
+       /*check if access can be granted as requested by client. */
+       samr_make_dom_obj_sd(p->mem_ctx, &psd, &sd_size);
+       se_map_generic(&des_access,&dom_generic_mapping);
+
+       if (!NT_STATUS_IS_OK(status = 
+                            access_check_samr_object(psd, p->pipe_user.nt_user_token, 
+                                                     des_access, &acc_granted, "_samr_open_domain"))) {
+               return status;
+       }
+
        /* associate the domain SID with the (unique) handle. */
-       if ((info = (struct samr_info *)malloc(sizeof(struct samr_info))) == NULL)
+       if ((info = get_samr_info_by_sid(&q_u->dom_sid.sid))==NULL)
                return NT_STATUS_NO_MEMORY;
-
-       ZERO_STRUCTP(info);
-       info->sid = q_u->dom_sid.sid;
+       info->acc_granted = acc_granted;
 
        /* get a (unique) handle.  open a policy on it. */
        if (!create_policy_hnd(p, &r_u->domain_pol, free_samr_info, (void *)info))
@@ -539,16 +409,6 @@ NTSTATUS _samr_open_domain(pipes_struct *p, SAMR_Q_OPEN_DOMAIN *q_u, SAMR_R_OPEN
        return r_u->status;
 }
 
-static uint32 get_lsa_policy_samr_rid(struct samr_info *info)
-{
-       if (!info) {
-               DEBUG(3,("Error getting policy\n"));
-               return 0xffffffff;
-       }
-
-       return info->sid.sub_auths[info->sid.num_auths-1];
-}
-
 /*******************************************************************
  _samr_get_usrdom_pwinfo
  ********************************************************************/
@@ -560,27 +420,68 @@ NTSTATUS _samr_get_usrdom_pwinfo(pipes_struct *p, SAMR_Q_GET_USRDOM_PWINFO *q_u,
        r_u->status = NT_STATUS_OK;
 
        /* find the policy handle.  open a policy on it. */
-       if (!find_policy_by_hnd(p, &q_u->user_pol, (void **)&info)) {
+       if (!find_policy_by_hnd(p, &q_u->user_pol, (void **)&info))
                return NT_STATUS_INVALID_HANDLE;
-       }
 
-       /* find the user's rid */
-       if (get_lsa_policy_samr_rid(info) == 0xffffffff) {
+       if (!sid_check_is_in_our_domain(&info->sid))
                return NT_STATUS_OBJECT_TYPE_MISMATCH;
-       }
 
        init_samr_r_get_usrdom_pwinfo(r_u, NT_STATUS_OK);
 
        DEBUG(5,("_samr_get_usrdom_pwinfo: %d\n", __LINE__));
 
+       /* 
+        * NT sometimes return NT_STATUS_ACCESS_DENIED
+        * I don't know yet why.
+        */
+
        return r_u->status;
 }
 
+/*******************************************************************
+ samr_make_dom_obj_sd
+ ********************************************************************/
+
+static NTSTATUS samr_make_dom_obj_sd(TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size)
+{
+       extern DOM_SID global_sid_World;
+       DOM_SID adm_sid;
+       DOM_SID act_sid;
+
+       SEC_ACE ace[3];
+       SEC_ACCESS mask;
+
+       SEC_ACL *psa = NULL;
+
+       sid_copy(&adm_sid, &global_sid_Builtin);
+       sid_append_rid(&adm_sid, BUILTIN_ALIAS_RID_ADMINS);
+
+       sid_copy(&act_sid, &global_sid_Builtin);
+       sid_append_rid(&act_sid, BUILTIN_ALIAS_RID_ACCOUNT_OPS);
+
+       /*basic access for every one*/
+       init_sec_access(&mask, GENERIC_RIGHTS_DOMAIN_EXECUTE | GENERIC_RIGHTS_DOMAIN_READ);
+       init_sec_ace(&ace[0], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
+       /*full access for builtin aliases Administrators and Account Operators*/
+       init_sec_access(&mask, GENERIC_RIGHTS_DOMAIN_ALL_ACCESS);
+       init_sec_ace(&ace[1], &adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+       init_sec_ace(&ace[2], &act_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
+       if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, 3, ace)) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       if ((*psd = make_sec_desc(ctx, SEC_DESC_REVISION, NULL, NULL, NULL, psa, sd_size)) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       return NT_STATUS_OK;
+}
+
 /*******************************************************************
  samr_make_usr_obj_sd
  ********************************************************************/
 
-static NTSTATUS samr_make_usr_obj_sd(TALLOC_CTX *ctx, SEC_DESC_BUF **buf, DOM_SID *usr_sid)
+static NTSTATUS samr_make_usr_obj_sd(TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size, DOM_SID *usr_sid)
 {
        extern DOM_SID global_sid_World;
        DOM_SID adm_sid;
@@ -590,8 +491,6 @@ static NTSTATUS samr_make_usr_obj_sd(TALLOC_CTX *ctx, SEC_DESC_BUF **buf, DOM_SI
        SEC_ACCESS mask;
 
        SEC_ACL *psa = NULL;
-       SEC_DESC *psd = NULL;
-       size_t sd_size;
 
        sid_copy(&adm_sid, &global_sid_Builtin);
        sid_append_rid(&adm_sid, BUILTIN_ALIAS_RID_ADMINS);
@@ -599,29 +498,107 @@ static NTSTATUS samr_make_usr_obj_sd(TALLOC_CTX *ctx, SEC_DESC_BUF **buf, DOM_SI
        sid_copy(&act_sid, &global_sid_Builtin);
        sid_append_rid(&act_sid, BUILTIN_ALIAS_RID_ACCOUNT_OPS);
 
-       init_sec_access(&mask, 0x2035b);
+       /*basic access for every one*/
+       init_sec_access(&mask, GENERIC_RIGHTS_USER_EXECUTE | GENERIC_RIGHTS_USER_READ);
        init_sec_ace(&ace[0], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
 
-       init_sec_access(&mask, 0xf07ff);
+       /*full access for builtin aliases Administrators and Account Operators*/
+       init_sec_access(&mask, GENERIC_RIGHTS_USER_ALL_ACCESS);
        init_sec_ace(&ace[1], &adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
        init_sec_ace(&ace[2], &act_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
 
-       init_sec_access(&mask,0x20044);
+       /*extended access for the user*/
+       init_sec_access(&mask,READ_CONTROL_ACCESS | SA_RIGHT_USER_CHANGE_PASSWORD | SA_RIGHT_USER_SET_LOC_COM);
        init_sec_ace(&ace[3], usr_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
 
-       if((psa = make_sec_acl(ctx, NT4_ACL_REVISION, 4, ace)) == NULL)
+       if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, 4, ace)) == NULL)
                return NT_STATUS_NO_MEMORY;
 
-       if((psd = make_sec_desc(ctx, SEC_DESC_REVISION, NULL, NULL, NULL, psa, &sd_size)) == NULL)
+       if ((*psd = make_sec_desc(ctx, SEC_DESC_REVISION, NULL, NULL, NULL, psa, sd_size)) == NULL)
                return NT_STATUS_NO_MEMORY;
 
-       if((*buf = make_sec_desc_buf(ctx, sd_size, psd)) == NULL)
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ samr_make_grp_obj_sd
+ ********************************************************************/
+
+static NTSTATUS samr_make_grp_obj_sd(TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size)
+{
+       extern DOM_SID global_sid_World;
+       DOM_SID adm_sid;
+       DOM_SID act_sid;
+
+       SEC_ACE ace[3];
+       SEC_ACCESS mask;
+
+       SEC_ACL *psa = NULL;
+
+       sid_copy(&adm_sid, &global_sid_Builtin);
+       sid_append_rid(&adm_sid, BUILTIN_ALIAS_RID_ADMINS);
+
+       sid_copy(&act_sid, &global_sid_Builtin);
+       sid_append_rid(&act_sid, BUILTIN_ALIAS_RID_ACCOUNT_OPS);
+
+       /*basic access for every one*/
+       init_sec_access(&mask, GENERIC_RIGHTS_GROUP_EXECUTE | GENERIC_RIGHTS_GROUP_READ);
+       init_sec_ace(&ace[0], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
+       /*full access for builtin aliases Administrators and Account Operators*/
+       init_sec_access(&mask, GENERIC_RIGHTS_GROUP_ALL_ACCESS);
+       init_sec_ace(&ace[1], &adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+       init_sec_ace(&ace[2], &act_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
+       if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, 3, ace)) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       if ((*psd = make_sec_desc(ctx, SEC_DESC_REVISION, NULL, NULL, NULL, psa, sd_size)) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ samr_make_ali_obj_sd
+ ********************************************************************/
+
+static NTSTATUS samr_make_ali_obj_sd(TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size)
+{
+       extern DOM_SID global_sid_World;
+       DOM_SID adm_sid;
+       DOM_SID act_sid;
+
+       SEC_ACE ace[3];
+       SEC_ACCESS mask;
+
+       SEC_ACL *psa = NULL;
+
+       sid_copy(&adm_sid, &global_sid_Builtin);
+       sid_append_rid(&adm_sid, BUILTIN_ALIAS_RID_ADMINS);
+
+       sid_copy(&act_sid, &global_sid_Builtin);
+       sid_append_rid(&act_sid, BUILTIN_ALIAS_RID_ACCOUNT_OPS);
+
+       /*basic access for every one*/
+       init_sec_access(&mask, GENERIC_RIGHTS_ALIAS_EXECUTE | GENERIC_RIGHTS_ALIAS_READ);
+       init_sec_ace(&ace[0], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
+       /*full access for builtin aliases Administrators and Account Operators*/
+       init_sec_access(&mask, GENERIC_RIGHTS_ALIAS_ALL_ACCESS);
+       init_sec_ace(&ace[1], &adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+       init_sec_ace(&ace[2], &act_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
+       if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, 3, ace)) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       if ((*psd = make_sec_desc(ctx, SEC_DESC_REVISION, NULL, NULL, NULL, psa, sd_size)) == NULL)
                return NT_STATUS_NO_MEMORY;
 
        return NT_STATUS_OK;
 }
 
-static BOOL get_lsa_policy_samr_sid(pipes_struct *p, POLICY_HND *pol, DOM_SID *sid)
+static BOOL get_lsa_policy_samr_sid(pipes_struct *p, POLICY_HND *pol, DOM_SID *sid, uint32 *acc_granted)
 {
        struct samr_info *info = NULL;
 
@@ -633,9 +610,21 @@ static BOOL get_lsa_policy_samr_sid(pipes_struct *p, POLICY_HND *pol, DOM_SID *s
                return False;
 
        *sid = info->sid;
+       *acc_granted = info->acc_granted;
        return True;
 }
 
+/*******************************************************************
+ _samr_set_sec_obj
+ ********************************************************************/
+
+NTSTATUS _samr_set_sec_obj(pipes_struct *p, SAMR_Q_SET_SEC_OBJ *q_u, SAMR_R_SET_SEC_OBJ *r_u)
+{
+       DEBUG(0,("_samr_set_sec_obj: Not yet implemented!\n"));
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+
 /*******************************************************************
  _samr_query_sec_obj
  ********************************************************************/
@@ -643,15 +632,53 @@ static BOOL get_lsa_policy_samr_sid(pipes_struct *p, POLICY_HND *pol, DOM_SID *s
 NTSTATUS _samr_query_sec_obj(pipes_struct *p, SAMR_Q_QUERY_SEC_OBJ *q_u, SAMR_R_QUERY_SEC_OBJ *r_u)
 {
        DOM_SID pol_sid;
+       fstring str_sid;
+       SEC_DESC * psd = NULL;
+       size_t sd_size;
+       uint32 acc_granted;
 
        r_u->status = NT_STATUS_OK;
 
        /* Get the SID. */
-
-       if (!get_lsa_policy_samr_sid(p, &q_u->user_pol, &pol_sid))
+       if (!get_lsa_policy_samr_sid(p, &q_u->user_pol, &pol_sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
 
-       r_u->status = samr_make_usr_obj_sd(p->mem_ctx, &r_u->buf, &pol_sid);
+
+
+       DEBUG(10,("_samr_query_sec_obj: querying security on SID: %s\n", sid_to_string(str_sid, &pol_sid)));
+
+       /* Check what typ of SID is beeing queried (e.g Domain SID, User SID, Group SID) */
+
+       /* To query the security of the SAM it self an invalid SID with S-0-0 is passed to this function */
+       if (pol_sid.sid_rev_num == 0)
+       {
+               DEBUG(5,("_samr_query_sec_obj: querying security on SAM\n"));
+               r_u->status = samr_make_sam_obj_sd(p->mem_ctx, &psd, &sd_size);
+       }
+       else if (sid_equal(&pol_sid,get_global_sam_sid()))  /* check if it is our domain SID */
+
+       {
+               DEBUG(5,("_samr_query_sec_obj: querying security on Domain with SID: %s\n", sid_to_string(str_sid, &pol_sid)));
+               r_u->status = samr_make_dom_obj_sd(p->mem_ctx, &psd, &sd_size);
+       }
+       else if (sid_equal(&pol_sid,&global_sid_Builtin)) /* check if it is the Builtin  Domain */
+       {
+               /* TODO: Builtin probably needs a different SD with restricted write access*/
+               DEBUG(5,("_samr_query_sec_obj: querying security on Builtin Domain with SID: %s\n", sid_to_string(str_sid, &pol_sid)));
+               r_u->status = samr_make_dom_obj_sd(p->mem_ctx, &psd, &sd_size);
+       }
+       else if (sid_check_is_in_our_domain(&pol_sid) ||
+                sid_check_is_in_builtin(&pol_sid))
+       {
+               /* TODO: different SDs have to be generated for aliases groups and users.
+                        Currently all three get a default user SD  */
+               DEBUG(10,("_samr_query_sec_obj: querying security on Object with SID: %s\n", sid_to_string(str_sid, &pol_sid)));
+               r_u->status = samr_make_usr_obj_sd(p->mem_ctx, &psd,&sd_size, &pol_sid);
+       }
+       else return NT_STATUS_OBJECT_TYPE_MISMATCH;
+
+       if ((r_u->buf = make_sec_desc_buf(p->mem_ctx, sd_size, psd)) == NULL)
+               return NT_STATUS_NO_MEMORY;
 
        if (NT_STATUS_IS_OK(r_u->status))
                r_u->ptr = 1;
@@ -663,69 +690,121 @@ NTSTATUS _samr_query_sec_obj(pipes_struct *p, SAMR_Q_QUERY_SEC_OBJ *q_u, SAMR_R_
 makes a SAM_ENTRY / UNISTR2* structure from a user list.
 ********************************************************************/
 
-static void make_user_sam_entry_list(TALLOC_CTX *ctx, SAM_ENTRY **sam_pp, UNISTR2 **uni_name_pp,
-                uint32 num_sam_entries, SAM_USER_INFO_21 *pass)
+static NTSTATUS make_user_sam_entry_list(TALLOC_CTX *ctx, SAM_ENTRY **sam_pp, UNISTR2 **uni_name_pp,
+                                        uint32 num_entries, uint32 start_idx, DISP_USER_INFO *disp_user_info,
+                                        DOM_SID *domain_sid)
 {
        uint32 i;
        SAM_ENTRY *sam;
        UNISTR2 *uni_name;
-
+       SAM_ACCOUNT *pwd = NULL;
+       UNISTR2 uni_temp_name;
+       const char *temp_name;
+       const DOM_SID *user_sid;
+       uint32 user_rid;
+       fstring user_sid_string;
+       fstring domain_sid_string;
+       
        *sam_pp = NULL;
        *uni_name_pp = NULL;
 
-       if (num_sam_entries == 0)
-               return;
+       if (num_entries == 0)
+               return NT_STATUS_OK;
 
-       sam = (SAM_ENTRY *)talloc_zero(ctx, sizeof(SAM_ENTRY)*num_sam_entries);
+       sam = (SAM_ENTRY *)talloc_zero(ctx, sizeof(SAM_ENTRY)*num_entries);
 
-       uni_name = (UNISTR2 *)talloc_zero(ctx, sizeof(UNISTR2)*num_sam_entries);
+       uni_name = (UNISTR2 *)talloc_zero(ctx, sizeof(UNISTR2)*num_entries);
 
        if (sam == NULL || uni_name == NULL) {
-               DEBUG(0, ("NULL pointers in SAMR_R_QUERY_DISPINFO\n"));
-               return;
+               DEBUG(0, ("make_user_sam_entry_list: talloc_zero failed!\n"));
+               return NT_STATUS_NO_MEMORY;
        }
 
-       ZERO_STRUCTP(sam);
-       ZERO_STRUCTP(uni_name);
-
-       for (i = 0; i < num_sam_entries; i++) {
-               int len = pass[i].uni_user_name.uni_str_len;
+       for (i = 0; i < num_entries; i++) {
+               pwd = disp_user_info[i+start_idx].sam;
+               temp_name = pdb_get_username(pwd);
+               init_unistr2(&uni_temp_name, temp_name, strlen(temp_name)+1);
+               user_sid = pdb_get_user_sid(pwd);
+
+               if (!sid_peek_check_rid(domain_sid, user_sid, &user_rid)) {
+                       DEBUG(0, ("make_user_sam_entry_list: User %s has SID %s, which conflicts with "
+                                 "the domain sid %s.  Failing operation.\n", 
+                                 temp_name, 
+                                 sid_to_string(user_sid_string, user_sid),
+                                 sid_to_string(domain_sid_string, domain_sid)));
+                       return NT_STATUS_UNSUCCESSFUL;
+               }
 
-               init_sam_entry(&sam[i], len, pass[i].user_rid);
-               copy_unistr2(&uni_name[i], &pass[i].uni_user_name);
+               init_sam_entry(&sam[i], uni_temp_name.uni_str_len, user_rid);
+               copy_unistr2(&uni_name[i], &uni_temp_name);
        }
 
        *sam_pp = sam;
        *uni_name_pp = uni_name;
+       return NT_STATUS_OK;
 }
 
 /*******************************************************************
  samr_reply_enum_dom_users
  ********************************************************************/
 
-NTSTATUS _samr_enum_dom_users(pipes_struct *p, SAMR_Q_ENUM_DOM_USERS *q_u, SAMR_R_ENUM_DOM_USERS *r_u)
+NTSTATUS _samr_enum_dom_users(pipes_struct *p, SAMR_Q_ENUM_DOM_USERS *q_u, 
+                             SAMR_R_ENUM_DOM_USERS *r_u)
 {
-       SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
-       int num_entries = 0;
-       int total_entries = 0;
+       struct samr_info *info = NULL;
+       uint32 struct_size=0x20; /* W2K always reply that, client doesn't care */
+       int num_account;
+       uint32 enum_context=q_u->start_idx;
+       uint32 max_size=q_u->max_size;
+       uint32 temp_size;
+       enum remote_arch_types ra_type = get_remote_arch();
+       int max_sam_entries = (ra_type == RA_WIN95) ? MAX_SAM_ENTRIES_W95 : MAX_SAM_ENTRIES_W2K;
+       uint32 max_entries = max_sam_entries;
+       DOM_SID domain_sid;
        
        r_u->status = NT_STATUS_OK;
 
        /* find the policy handle.  open a policy on it. */
-       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;
 
+       domain_sid = info->sid;
+
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(info->acc_granted, 
+                                       SA_RIGHT_DOMAIN_ENUM_ACCOUNTS, 
+                                       "_samr_enum_dom_users"))) {
+               return r_u->status;
+       }
+       
        DEBUG(5,("_samr_enum_dom_users: %d\n", __LINE__));
 
        become_root();
-       r_u->status = get_sampwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
-                                                               MAX_SAM_ENTRIES, q_u->acb_mask);
+       r_u->status=load_sampwd_entries(info, q_u->acb_mask, False);
        unbecome_root();
-
-       if (NT_STATUS_IS_ERR(r_u->status))
+       
+       if (!NT_STATUS_IS_OK(r_u->status))
                return r_u->status;
 
-       samr_clear_passwd_fields(pass, num_entries);
+       num_account = info->disp_info.num_user_account;
+
+       if (enum_context > num_account) {
+               DEBUG(5, ("_samr_enum_dom_users: enumeration handle over total entries\n"));
+               return NT_STATUS_OK;
+       }
+
+       /* verify we won't overflow */
+       if (max_entries > num_account-enum_context) {
+               max_entries = num_account-enum_context;
+               DEBUG(5, ("_samr_enum_dom_users: only %d entries to return\n", max_entries));
+       }
+
+       /* calculate the size and limit on the number of entries we will return */
+       temp_size=max_entries*struct_size;
+       
+       if (temp_size>max_size) {
+               max_entries=MIN((max_size/struct_size),max_entries);;
+               DEBUG(5, ("_samr_enum_dom_users: buffer size limits to only %d entries\n", max_entries));
+       }
 
        /* 
         * Note from JRA. total_entries is not being used here. Currently if there is a
@@ -740,9 +819,20 @@ NTSTATUS _samr_enum_dom_users(pipes_struct *p, SAMR_Q_ENUM_DOM_USERS *q_u, SAMR_
         * value (again I think this is wrong).
         */
 
-       make_user_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_acct_name, num_entries, pass);
+       r_u->status = make_user_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_acct_name, 
+                                              max_entries, enum_context, 
+                                              info->disp_info.disp_user_info,
+                                              &domain_sid);
 
-       init_samr_r_enum_dom_users(r_u, q_u->start_idx + num_entries, num_entries);
+       if (!NT_STATUS_IS_OK(r_u->status))
+               return r_u->status;
+
+       if (enum_context+max_entries < num_account)
+               r_u->status = STATUS_MORE_ENTRIES;
+
+       DEBUG(5, ("_samr_enum_dom_users: %d\n", __LINE__));
+
+       init_samr_r_enum_dom_users(r_u, q_u->start_idx + max_entries, max_entries);
 
        DEBUG(5,("_samr_enum_dom_users: %d\n", __LINE__));
 
@@ -800,7 +890,7 @@ static NTSTATUS get_group_alias_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DOM
        uint32 num_entries = 0;
        int i;
        GROUP_MAP smap;
-       GROUP_MAP *map;
+       GROUP_MAP *map = NULL;
 
        sid_to_string(sid_str, sid);
        DEBUG(5, ("get_group_alias_entries: enumerating aliases on SID: %s\n", sid_str));
@@ -810,27 +900,27 @@ static NTSTATUS get_group_alias_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DOM
        /* well-known aliases */
        if (sid_equal(sid, &global_sid_Builtin) && !lp_hide_local_users()) {
                
-               enum_group_mapping(SID_NAME_WKN_GRP, &map, (int *)&num_entries, ENUM_ALL_MAPPED);
+               pdb_enum_group_mapping(SID_NAME_WKN_GRP, &map, (int *)&num_entries, ENUM_ONLY_MAPPED, MAPPING_WITHOUT_PRIV);
                
-               if (num_entries != 0) {
+               if (num_entries != 0) {         
                        *d_grp=(DOMAIN_GRP *)talloc_zero(ctx, num_entries*sizeof(DOMAIN_GRP));
                        if (*d_grp==NULL)
                                return NT_STATUS_NO_MEMORY;
                        
                        for(i=0; i<num_entries && i<max_entries; i++) {
                                fstrcpy((*d_grp)[i].name, map[i+start_idx].nt_name);
-                               sid_split_rid(&map[i].sid, &(*d_grp)[i].rid);
+                               sid_split_rid(&map[i+start_idx].sid, &(*d_grp)[i].rid);
                                
                        }
                }
                SAFE_FREE(map);
                
-       } else if (sid_equal(sid, &global_sam_sid) && !lp_hide_local_users()) {
-               char *sep;
+       } else if (sid_equal(sid, get_global_sam_sid()) && !lp_hide_local_users()) {
                struct sys_grent *glist;
                struct sys_grent *grp;
-       
-               sep = lp_winbind_separator();
+               struct passwd *pw;
+               gid_t winbind_gid_low, winbind_gid_high;
+               BOOL winbind_groups_exist = lp_idmap_gid(&winbind_gid_low, &winbind_gid_high);
 
                /* local aliases */
                /* we return the UNIX groups here.  This seems to be the right */
@@ -847,24 +937,27 @@ static NTSTATUS get_group_alias_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DOM
                for (; (num_entries < max_entries) && (grp != NULL); grp = grp->next) {
                        uint32 trid;
                        
-                       if(!get_group_from_gid(grp->gr_gid, &smap)) {
+                       if(!pdb_getgrgid(&smap, grp->gr_gid, MAPPING_WITHOUT_PRIV))
                                continue;
-                       }
-
+                       
                        if (smap.sid_name_use!=SID_NAME_ALIAS) {
                                continue;
                        }
 
                        sid_split_rid(&smap.sid, &trid);
+                       
+                       if (!sid_equal(sid, &smap.sid))
+                               continue;
 
                        /* Don't return winbind groups as they are not local! */
-                       if (strchr_m(smap.nt_name, *sep) != NULL) {
+                       if (winbind_groups_exist && (grp->gr_gid >= winbind_gid_low)&&(grp->gr_gid <= winbind_gid_high)) {
                                DEBUG(10,("get_group_alias_entries: not returing %s, not local.\n", smap.nt_name ));
                                continue;
                        }
 
                        /* Don't return user private groups... */
-                       if (Get_Pwnam(smap.nt_name, False) != 0) {
+
+                       if ((pw = Get_Pwnam(smap.nt_name)) != 0) {
                                DEBUG(10,("get_group_alias_entries: not returing %s, clashes with user.\n", smap.nt_name ));
                                continue;                       
                        }
@@ -873,8 +966,9 @@ static NTSTATUS get_group_alias_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DOM
                                if ( (*d_grp)[i].rid == trid )
                                        break;
 
-                       if ( i < num_entries )
+                       if ( i < num_entries ) {
                                continue; /* rid was there, dup! */
+                       }
 
                        /* JRA - added this for large group db enumeration... */
 
@@ -924,7 +1018,7 @@ static NTSTATUS get_group_domain_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DO
 
        *p_num_entries = 0;
 
-       enum_group_mapping(SID_NAME_DOM_GRP, &map, (int *)&group_entries, ENUM_ONLY_MAPPED);
+       pdb_enum_group_mapping(SID_NAME_DOM_GRP, &map, (int *)&group_entries, ENUM_ONLY_MAPPED, MAPPING_WITHOUT_PRIV);
 
        num_entries=group_entries-start_idx;
 
@@ -956,8 +1050,6 @@ static NTSTATUS get_group_domain_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DO
 
 /*******************************************************************
  samr_reply_enum_dom_groups
- Only reply with one group - domain admins. This must be fixed for
- a real PDC. JRA.
  ********************************************************************/
 
 NTSTATUS _samr_enum_dom_groups(pipes_struct *p, SAMR_Q_ENUM_DOM_GROUPS *q_u, SAMR_R_ENUM_DOM_GROUPS *r_u)
@@ -965,16 +1057,23 @@ NTSTATUS _samr_enum_dom_groups(pipes_struct *p, SAMR_Q_ENUM_DOM_GROUPS *q_u, SAM
        DOMAIN_GRP *grp=NULL;
        uint32 num_entries;
        DOM_SID sid;
+       uint32 acc_granted;
 
        r_u->status = NT_STATUS_OK;
 
-       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &sid))
+       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
+               
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_DOMAIN_ENUM_ACCOUNTS, "_samr_enum_dom_groups"))) {
+               return r_u->status;
+       }
 
        DEBUG(5,("samr_reply_enum_dom_groups: %d\n", __LINE__));
 
        /* the domain group array is being allocated in the function below */
-       get_group_domain_entries(p->mem_ctx, &grp, &sid, q_u->start_idx, &num_entries, MAX_SAM_ENTRIES);
+       if (!NT_STATUS_IS_OK(r_u->status = get_group_domain_entries(p->mem_ctx, &grp, &sid, q_u->start_idx, &num_entries, MAX_SAM_ENTRIES))) {
+               return r_u->status;
+       }
 
        make_group_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_grp_name, num_entries, grp);
 
@@ -997,12 +1096,17 @@ NTSTATUS _samr_enum_dom_aliases(pipes_struct *p, SAMR_Q_ENUM_DOM_ALIASES *q_u, S
        fstring sid_str;
        DOM_SID sid;
        NTSTATUS status;
+       uint32  acc_granted;
        
        r_u->status = NT_STATUS_OK;
 
-       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &sid))
+       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
 
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_DOMAIN_ENUM_ACCOUNTS, "_samr_enum_dom_aliases"))) {
+               return r_u->status;
+       }
+       
        sid_to_string(sid_str, &sid);
        DEBUG(5,("samr_reply_enum_dom_aliases: sid %s\n", sid_str));
 
@@ -1024,91 +1128,124 @@ NTSTATUS _samr_enum_dom_aliases(pipes_struct *p, SAMR_Q_ENUM_DOM_ALIASES *q_u, S
 /*******************************************************************
  samr_reply_query_dispinfo
  ********************************************************************/
-
-NTSTATUS _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, SAMR_R_QUERY_DISPINFO *r_u)
+NTSTATUS _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, 
+                             SAMR_R_QUERY_DISPINFO *r_u)
 {
-       SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
-       DOMAIN_GRP *grps=NULL;
-       uint16 acb_mask = ACB_NORMAL;
-       uint32 num_entries = 0;
-       int orig_num_entries = 0;
-       int total_entries = 0;
-       uint32 data_size = 0;
-       DOM_SID sid;
-       NTSTATUS disp_ret;
+       struct samr_info *info = NULL;
+       uint32 struct_size=0x20; /* W2K always reply that, client doesn't care */
+       
+       uint32 max_entries=q_u->max_entries;
+       uint32 enum_context=q_u->start_idx;
+       uint32 max_size=q_u->max_size;
+
        SAM_DISPINFO_CTR *ctr;
+       uint32 temp_size=0, total_data_size=0;
+       NTSTATUS disp_ret;
+       uint32 num_account = 0;
+       enum remote_arch_types ra_type = get_remote_arch();
+       int max_sam_entries = (ra_type == RA_WIN95) ? MAX_SAM_ENTRIES_W95 : MAX_SAM_ENTRIES_W2K;
+       DOM_SID domain_sid;
 
        DEBUG(5, ("samr_reply_query_dispinfo: %d\n", __LINE__));
-
        r_u->status = NT_STATUS_OK;
 
-       if (!get_lsa_policy_samr_sid(p, &q_u->domain_pol, &sid))
+       /* find the policy handle.  open a policy on it. */
+       if (!find_policy_by_hnd(p, &q_u->domain_pol, (void **)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       /* decide how many entries to get depending on the max_entries
-          and max_size passed by client */
-
-       DEBUG(5, ("samr_reply_query_dispinfo: max_entries before %d\n", q_u->max_entries));
+       domain_sid = info->sid;
 
-       if(q_u->max_entries > MAX_SAM_ENTRIES)
-               q_u->max_entries = MAX_SAM_ENTRIES;
+       /*
+        * calculate how many entries we will return.
+        * based on 
+        * - the number of entries the client asked
+        * - our limit on that
+        * - the starting point (enumeration context)
+        * - the buffer size the client will accept
+        */
 
-       DEBUG(5, ("samr_reply_query_dispinfo: max_entries after %d\n", q_u->max_entries));
+       /*
+        * We are a lot more like W2K. Instead of reading the SAM
+        * each time to find the records we need to send back,
+        * we read it once and link that copy to the sam handle.
+        * For large user list (over the MAX_SAM_ENTRIES)
+        * it's a definitive win.
+        * second point to notice: between enumerations
+        * our sam is now the same as it's a snapshoot.
+        * third point: got rid of the static SAM_USER_21 struct
+        * no more intermediate.
+        * con: it uses much more memory, as a full copy is stored
+        * in memory.
+        *
+        * If you want to change it, think twice and think
+        * of the second point , that's really important.
+        *
+        * JFM, 12/20/2001
+        */
 
        /* Get what we need from the password database */
        switch (q_u->switch_level) {
-       case 0x2:
-               acb_mask = ACB_WSTRUST;
-               /* Fall through */
-       case 0x1:
-       case 0x4:
-               become_root();
-#if 0
-               r_u->status = get_passwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
-                                               MAX_SAM_ENTRIES, acb_mask);
-#endif
+               case 0x1:
+                       /* When playing with usrmgr, this is necessary
+                           if you want immediate refresh after editing
+                           a user. I would like to do this after the
+                           setuserinfo2, but we do not have access to
+                           the domain handle in that call, only to the
+                           user handle. Where else does this hurt?
+                          -- Volker
+                       */
 #if 0
-       /*
-        * Which should we use here ? JRA.
-        */
-               r_u->status = get_sampwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
-                                               MAX_SAM_ENTRIES, acb_mask);
-#endif
-#if 1
-               r_u->status = jf_get_sampwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
-                                               MAX_SAM_ENTRIES, acb_mask);
-#endif
-               unbecome_root();
-               if (NT_STATUS_IS_ERR(r_u->status)) {
-                       DEBUG(5, ("get_sampwd_entries: failed\n"));
-                       return r_u->status;
-               }
-               break;
-       case 0x3:
-       case 0x5:
-               r_u->status = get_group_domain_entries(p->mem_ctx, &grps, &sid, q_u->start_idx, &num_entries, MAX_SAM_ENTRIES);
-               if (NT_STATUS_IS_ERR(r_u->status))
-                       return r_u->status;
-               break;
-       default:
-               DEBUG(0,("_samr_query_dispinfo: Unknown info level (%u)\n", (unsigned int)q_u->switch_level ));
-               return NT_STATUS_INVALID_INFO_CLASS;
+                       /* We cannot do this here - it kills performace. JRA. */
+                       free_samr_users(info);
+#endif
+               case 0x2:
+               case 0x4:
+                       become_root();          
+                       /* Level 2 is for all machines, otherwise only 'normal' users */
+                       r_u->status=load_sampwd_entries(info, ACB_NORMAL, q_u->switch_level==2);
+                       unbecome_root();
+                       if (!NT_STATUS_IS_OK(r_u->status)) {
+                               DEBUG(5, ("_samr_query_dispinfo: load_sampwd_entries failed\n"));
+                               return r_u->status;
+                       }
+                       num_account = info->disp_info.num_user_account;
+                       break;
+               case 0x3:
+               case 0x5:
+                       r_u->status = load_group_domain_entries(info, &info->sid);
+                       if (!NT_STATUS_IS_OK(r_u->status))
+                               return r_u->status;
+                       num_account = info->disp_info.num_group_account;
+                       break;
+               default:
+                       DEBUG(0,("_samr_query_dispinfo: Unknown info level (%u)\n", (unsigned int)q_u->switch_level ));
+                       return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-       orig_num_entries = num_entries;
-
-       if (num_entries > q_u->max_entries)
-               num_entries = q_u->max_entries;
+       /* first limit the number of entries we will return */
+       if(max_entries > max_sam_entries) {
+               DEBUG(5, ("samr_reply_query_dispinfo: client requested %d entries, limiting to %d\n", max_entries, max_sam_entries));
+               max_entries = max_sam_entries;
+       }
 
-       if (num_entries > MAX_SAM_ENTRIES) {
-               num_entries = MAX_SAM_ENTRIES;
-               DEBUG(5, ("limiting number of entries to %d\n", num_entries));
+       if (enum_context > num_account) {
+               DEBUG(5, ("samr_reply_query_dispinfo: enumeration handle over total entries\n"));
+               return NT_STATUS_NO_MORE_ENTRIES;
        }
 
-       /* Ensure password info is never given out here. PARANOIA... JRA */
-       samr_clear_passwd_fields(pass, num_entries);
+       /* verify we won't overflow */
+       if (max_entries > num_account-enum_context) {
+               max_entries = num_account-enum_context;
+               DEBUG(5, ("samr_reply_query_dispinfo: only %d entries to return\n", max_entries));
+       }
 
-       data_size = q_u->max_size;
+       /* calculate the size and limit on the number of entries we will return */
+       temp_size=max_entries*struct_size;
+       
+       if (temp_size>max_size) {
+               max_entries=MIN((max_size/struct_size),max_entries);;
+               DEBUG(5, ("samr_reply_query_dispinfo: buffer size limits to only %d entries\n", max_entries));
+       }
 
        if (!(ctr = (SAM_DISPINFO_CTR *)talloc_zero(p->mem_ctx,sizeof(SAM_DISPINFO_CTR))))
                return NT_STATUS_NO_MEMORY;
@@ -1118,63 +1255,70 @@ NTSTATUS _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, SAMR_
        /* Now create reply structure */
        switch (q_u->switch_level) {
        case 0x1:
-               if (num_entries) {
-                       if (!(ctr->sam.info1 = (SAM_DISPINFO_1 *)talloc_zero(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_1))))
+               if (max_entries) {
+                       if (!(ctr->sam.info1 = (SAM_DISPINFO_1 *)talloc_zero(p->mem_ctx,max_entries*sizeof(SAM_DISPINFO_1))))
                                return NT_STATUS_NO_MEMORY;
                }
-               disp_ret = init_sam_dispinfo_1(p->mem_ctx, ctr->sam.info1, &num_entries, &data_size, q_u->start_idx, pass);
-               if (NT_STATUS_IS_ERR(disp_ret))
+               disp_ret = init_sam_dispinfo_1(p->mem_ctx, ctr->sam.info1, max_entries, enum_context, 
+                                              info->disp_info.disp_user_info, &domain_sid);
+               if (!NT_STATUS_IS_OK(disp_ret))
                        return disp_ret;
                break;
        case 0x2:
-               if (num_entries) {
-                       if (!(ctr->sam.info2 = (SAM_DISPINFO_2 *)talloc_zero(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_2))))
+               if (max_entries) {
+                       if (!(ctr->sam.info2 = (SAM_DISPINFO_2 *)talloc_zero(p->mem_ctx,max_entries*sizeof(SAM_DISPINFO_2))))
                                return NT_STATUS_NO_MEMORY;
                }
-               disp_ret = init_sam_dispinfo_2(p->mem_ctx, ctr->sam.info2, &num_entries, &data_size, q_u->start_idx, pass);
-               if (NT_STATUS_IS_ERR(disp_ret))
+               disp_ret = init_sam_dispinfo_2(p->mem_ctx, ctr->sam.info2, max_entries, enum_context, 
+                                              info->disp_info.disp_user_info, &domain_sid);
+               if (!NT_STATUS_IS_OK(disp_ret))
                        return disp_ret;
                break;
        case 0x3:
-               if (num_entries) {
-                       if (!(ctr->sam.info3 = (SAM_DISPINFO_3 *)talloc_zero(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_3))))
+               if (max_entries) {
+                       if (!(ctr->sam.info3 = (SAM_DISPINFO_3 *)talloc_zero(p->mem_ctx,max_entries*sizeof(SAM_DISPINFO_3))))
                                return NT_STATUS_NO_MEMORY;
                }
-               disp_ret = init_sam_dispinfo_3(p->mem_ctx, ctr->sam.info3, &num_entries, &data_size, q_u->start_idx, grps);
-               if (NT_STATUS_IS_ERR(disp_ret))
+               disp_ret = init_sam_dispinfo_3(p->mem_ctx, ctr->sam.info3, max_entries, enum_context, info->disp_info.disp_group_info);
+               if (!NT_STATUS_IS_OK(disp_ret))
                        return disp_ret;
                break;
        case 0x4:
-               if (num_entries) {
-                       if (!(ctr->sam.info4 = (SAM_DISPINFO_4 *)talloc_zero(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_4))))
+               if (max_entries) {
+                       if (!(ctr->sam.info4 = (SAM_DISPINFO_4 *)talloc_zero(p->mem_ctx,max_entries*sizeof(SAM_DISPINFO_4))))
                                return NT_STATUS_NO_MEMORY;
                }
-               disp_ret = init_sam_dispinfo_4(p->mem_ctx, ctr->sam.info4, &num_entries, &data_size, q_u->start_idx, pass);
-               if (NT_STATUS_IS_ERR(disp_ret))
+               disp_ret = init_sam_dispinfo_4(p->mem_ctx, ctr->sam.info4, max_entries, enum_context, info->disp_info.disp_user_info);
+               if (!NT_STATUS_IS_OK(disp_ret))
                        return disp_ret;
                break;
        case 0x5:
-               if (num_entries) {
-                       if (!(ctr->sam.info5 = (SAM_DISPINFO_5 *)talloc_zero(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_5))))
+               if (max_entries) {
+                       if (!(ctr->sam.info5 = (SAM_DISPINFO_5 *)talloc_zero(p->mem_ctx,max_entries*sizeof(SAM_DISPINFO_5))))
                                return NT_STATUS_NO_MEMORY;
                }
-               disp_ret = init_sam_dispinfo_5(p->mem_ctx, ctr->sam.info5, &num_entries, &data_size, q_u->start_idx, grps);
-               if (NT_STATUS_IS_ERR(disp_ret))
+               disp_ret = init_sam_dispinfo_5(p->mem_ctx, ctr->sam.info5, max_entries, enum_context, info->disp_info.disp_group_info);
+               if (!NT_STATUS_IS_OK(disp_ret))
                        return disp_ret;
                break;
+
        default:
                ctr->sam.info = NULL;
                return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-       DEBUG(5, ("_samr_query_dispinfo: %d\n", __LINE__));
+       /* calculate the total size */
+       total_data_size=num_account*struct_size;
 
-       if (num_entries < orig_num_entries)
-               return STATUS_MORE_ENTRIES;
+       if (enum_context+max_entries < num_account)
+               r_u->status = STATUS_MORE_ENTRIES;
+
+       DEBUG(5, ("_samr_query_dispinfo: %d\n", __LINE__));
 
-       init_samr_r_query_dispinfo(r_u, num_entries, data_size, q_u->switch_level, ctr, r_u->status);
+       init_samr_r_query_dispinfo(r_u, max_entries, total_data_size, temp_size, q_u->switch_level, ctr, r_u->status);
 
        return r_u->status;
+
 }
 
 /*******************************************************************
@@ -1183,32 +1327,38 @@ NTSTATUS _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, SAMR_
 
 NTSTATUS _samr_query_aliasinfo(pipes_struct *p, SAMR_Q_QUERY_ALIASINFO *q_u, SAMR_R_QUERY_ALIASINFO *r_u)
 {
-       fstring alias_desc = "Local Unix group";
-       fstring alias="";
-       enum SID_NAME_USE type;
-       uint32 alias_rid;
-       struct samr_info *info = NULL;
+       DOM_SID   sid;
+       GROUP_MAP map;
+       uint32    acc_granted;
 
        r_u->status = NT_STATUS_OK;
 
        DEBUG(5,("_samr_query_aliasinfo: %d\n", __LINE__));
 
        /* find the policy handle.  open a policy on it. */
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
+       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_ALIAS_LOOKUP_INFO, "_samr_query_aliasinfo"))) {
+               return r_u->status;
+       }
 
-       alias_rid = get_lsa_policy_samr_rid(info);
-       if(alias_rid == 0xffffffff)
-               return NT_STATUS_NO_SUCH_ALIAS;
+       if (!sid_check_is_in_our_domain(&sid) &&
+           !sid_check_is_in_builtin(&sid))
+               return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-       if(!local_lookup_rid(alias_rid, alias, &type))
+       if (!pdb_getgrsid(&map, sid, MAPPING_WITHOUT_PRIV))
                return NT_STATUS_NO_SUCH_ALIAS;
 
        switch (q_u->switch_level) {
+       case 1:
+               r_u->ptr = 1;
+               r_u->ctr.switch_value1 = 1;
+               init_samr_alias_info1(&r_u->ctr.alias.info1, map.nt_name, 1, map.comment);
+               break;
        case 3:
                r_u->ptr = 1;
                r_u->ctr.switch_value1 = 3;
-               init_samr_alias_info3(&r_u->ctr.alias.info3, alias_desc);
+               init_samr_alias_info3(&r_u->ctr.alias.info3, map.comment);
                break;
        default:
                return NT_STATUS_INVALID_INFO_CLASS;
@@ -1285,53 +1435,83 @@ NTSTATUS _samr_query_aliasinfo(pipes_struct *p, SAMR_Q_QUERY_ALIASINFO *q_u, SAM
 
 NTSTATUS _samr_lookup_names(pipes_struct *p, SAMR_Q_LOOKUP_NAMES *q_u, SAMR_R_LOOKUP_NAMES *r_u)
 {
-    uint32 rid[MAX_SAM_ENTRIES];
-    enum SID_NAME_USE type[MAX_SAM_ENTRIES];
-    int i;
-    int num_rids = q_u->num_names2;
-    DOM_SID pol_sid;
-
-    r_u->status = NT_STATUS_OK;
-
-    DEBUG(5,("_samr_lookup_names: %d\n", __LINE__));
+       uint32 rid[MAX_SAM_ENTRIES];
+       uint32 local_rid;
+       enum SID_NAME_USE type[MAX_SAM_ENTRIES];
+       enum SID_NAME_USE local_type;
+       int i;
+       int num_rids = q_u->num_names2;
+       DOM_SID pol_sid;
+       fstring sid_str;
+       uint32  acc_granted;
 
-    ZERO_ARRAY(rid);
-    ZERO_ARRAY(type);
+       r_u->status = NT_STATUS_OK;
 
-    if (!get_lsa_policy_samr_sid(p, &q_u->pol, &pol_sid)) {
-        init_samr_r_lookup_names(p->mem_ctx, r_u, 0, NULL, NULL, NT_STATUS_OBJECT_TYPE_MISMATCH);
-        return r_u->status;
-    }
+       DEBUG(5,("_samr_lookup_names: %d\n", __LINE__));
 
-    if (num_rids > MAX_SAM_ENTRIES) {
-        num_rids = MAX_SAM_ENTRIES;
-        DEBUG(5,("_samr_lookup_names: truncating entries to %d\n", num_rids));
-    }
+       ZERO_ARRAY(rid);
+       ZERO_ARRAY(type);
 
-    for (i = 0; i < num_rids; i++) {
-        fstring name;
+       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &pol_sid, &acc_granted)) {
+               init_samr_r_lookup_names(p->mem_ctx, r_u, 0, NULL, NULL, NT_STATUS_OBJECT_TYPE_MISMATCH);
+               return r_u->status;
+       }
+       
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, 0, "_samr_lookup_names"))) { /* Don't know the acc_bits yet */
+               return r_u->status;
+       }
 
-        r_u->status = NT_STATUS_NONE_MAPPED;
+       if (num_rids > MAX_SAM_ENTRIES) {
+               num_rids = MAX_SAM_ENTRIES;
+               DEBUG(5,("_samr_lookup_names: truncating entries to %d\n", num_rids));
+       }
 
-        rid [i] = 0xffffffff;
-        type[i] = SID_NAME_UNKNOWN;
+       DEBUG(5,("_samr_lookup_names: looking name on SID %s\n", sid_to_string(sid_str, &pol_sid)));
+       
+       become_root(); /* local_lookup_name can require root privs */
 
-       rpcstr_pull(name, q_u->uni_name[i].buffer, sizeof(name), q_u->uni_name[i].uni_str_len*2, 0);
+       for (i = 0; i < num_rids; i++) {
+               fstring name;
+               DOM_SID sid;
+               int ret;
+
+               r_u->status = NT_STATUS_NONE_MAPPED;
+
+               rid [i] = 0xffffffff;
+               type[i] = SID_NAME_UNKNOWN;
+
+               ret = rpcstr_pull(name, q_u->uni_name[i].buffer, sizeof(name), q_u->uni_name[i].uni_str_len*2, 0);
+
+               /*
+                * we are only looking for a name
+                * the SID we get back can be outside
+                * the scope of the pol_sid
+                * 
+                * in clear: it prevents to reply to domain\group: yes
+                * when only builtin\group exists.
+                *
+                * a cleaner code is to add the sid of the domain we're looking in
+                * to the local_lookup_name function.
+                */
+                
+               if ((ret > 0) && local_lookup_name(name, &sid, &local_type)) {
+                       sid_split_rid(&sid, &local_rid);
+                               
+                       if (sid_equal(&sid, &pol_sid)) {
+                               rid[i]=local_rid;
+                               type[i]=local_type;
+                               r_u->status = NT_STATUS_OK;
+                       }
+               }
+       }
 
-        if(sid_equal(&pol_sid, &global_sam_sid)) {
-            DOM_SID sid;
-            if(local_lookup_name(global_myname, name, &sid, &type[i])) {
-                sid_split_rid( &sid, &rid[i]);
-                r_u->status = NT_STATUS_OK;
-            }
-        }
-    }
+       unbecome_root();
 
-    init_samr_r_lookup_names(p->mem_ctx, r_u, num_rids, rid, (uint32 *)type, r_u->status);
+       init_samr_r_lookup_names(p->mem_ctx, r_u, num_rids, rid, (uint32 *)type, r_u->status);
 
-    DEBUG(5,("_samr_lookup_names: %d\n", __LINE__));
+       DEBUG(5,("_samr_lookup_names: %d\n", __LINE__));
 
-    return r_u->status;
+       return r_u->status;
 }
 
 /*******************************************************************
@@ -1360,13 +1540,12 @@ NTSTATUS _samr_chgpasswd_user(pipes_struct *p, SAMR_Q_CHGPASSWD_USER *q_u, SAMR_
        (void)map_username(user_name);
  
        /*
-        * Do any UNIX username case mangling.
+        * UNIX username case mangling not required, pass_oem_change 
+        * is case insensitive.
         */
-       (void)Get_Pwnam( user_name, True);
 
-    if (!pass_oem_change(user_name, q_u->lm_newpass.pass, q_u->lm_oldhash.hash,
-                         q_u->nt_newpass.pass, q_u->nt_oldhash.hash))
-        r_u->status = NT_STATUS_WRONG_PASSWORD;
+    r_u->status = pass_oem_change(user_name, q_u->lm_newpass.pass, q_u->lm_oldhash.hash,
+                                 q_u->nt_newpass.pass, q_u->nt_oldhash.hash);
 
     init_samr_r_chgpasswd_user(r_u, r_u->status);
 
@@ -1425,13 +1604,14 @@ NTSTATUS _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOK
        DOM_SID pol_sid;
        int num_rids = q_u->num_rids1;
        int i;
+       uint32 acc_granted;
 
        r_u->status = NT_STATUS_OK;
 
        DEBUG(5,("_samr_lookup_rids: %d\n", __LINE__));
 
        /* find the policy handle.  open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &pol_sid))
+       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &pol_sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
 
        if (num_rids > MAX_SAM_ENTRIES) {
@@ -1446,6 +1626,8 @@ NTSTATUS _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOK
  
        r_u->status = NT_STATUS_NONE_MAPPED;
 
+       become_root();  /* lookup_sid can require root privs */
+
        for (i = 0; i < num_rids; i++) {
                fstring tmpname;
                fstring domname;
@@ -1455,7 +1637,7 @@ NTSTATUS _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOK
                group_attrs[i] = SID_NAME_UNKNOWN;
                *group_names[i] = '\0';
 
-               if (sid_equal(&pol_sid, &global_sam_sid)) {
+               if (sid_equal(&pol_sid, get_global_sam_sid())) {
                        sid_copy(&sid, &pol_sid);
                        sid_append_rid(&sid, q_u->rid[i]);
 
@@ -1468,6 +1650,8 @@ NTSTATUS _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOK
                }
        }
 
+       unbecome_root();
+
        if(!make_samr_lookup_rids(p->mem_ctx, num_rids, group_names, &hdr_name, &uni_name))
                return NT_STATUS_NO_MEMORY;
 
@@ -1487,46 +1671,58 @@ NTSTATUS _api_samr_open_user(pipes_struct *p, SAMR_Q_OPEN_USER *q_u, SAMR_R_OPEN
        SAM_ACCOUNT *sampass=NULL;
        DOM_SID sid;
        POLICY_HND domain_pol = q_u->domain_pol;
-       uint32 user_rid = q_u->user_rid;
        POLICY_HND *user_pol = &r_u->user_pol;
        struct samr_info *info = NULL;
+       SEC_DESC *psd = NULL;
+       uint32    acc_granted;
+       uint32    des_access = q_u->access_mask;
+       size_t    sd_size;
        BOOL ret;
+       NTSTATUS nt_status;
 
        r_u->status = NT_STATUS_OK;
 
-       /* find the domain policy handle. */
-       if (!find_policy_by_hnd(p, &domain_pol, NULL))
+       /* find the domain policy handle and get domain SID / access bits in the domain policy. */
+       if (!get_lsa_policy_samr_sid(p, &domain_pol, &sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
+       
+       if (!NT_STATUS_IS_OK(nt_status = access_check_samr_function(acc_granted, SA_RIGHT_DOMAIN_OPEN_ACCOUNT, "_samr_open_user"))) {
+               return nt_status;
+       }
+
+       nt_status = pdb_init_sam_talloc(p->mem_ctx, &sampass);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               return nt_status;
+       }
 
-       pdb_init_sam(&sampass);
+       /* append the user's RID to it */
+       if (!sid_append_rid(&sid, q_u->user_rid))
+               return NT_STATUS_NO_SUCH_USER;
+       
+       /* check if access can be granted as requested by client. */
+       samr_make_usr_obj_sd(p->mem_ctx, &psd, &sd_size, &sid);
+       se_map_generic(&des_access, &usr_generic_mapping);
+       if (!NT_STATUS_IS_OK(nt_status = 
+                            access_check_samr_object(psd, p->pipe_user.nt_user_token, 
+                                                     des_access, &acc_granted, "_samr_open_user"))) {
+               return nt_status;
+       }
 
        become_root();
-       ret=pdb_getsampwrid(sampass, user_rid);
+       ret=pdb_getsampwsid(sampass, &sid);
        unbecome_root();
 
-       /* check that the RID exists in our domain. */
+       /* check that the SID exists in our domain. */
        if (ret == False) {
-               pdb_free_sam(&sampass);
                return NT_STATUS_NO_SUCH_USER;
        }
 
-       samr_clear_sam_passwd(sampass);
        pdb_free_sam(&sampass);
 
-       /* Get the domain SID stored in the domain policy */
-       if(!get_lsa_policy_samr_sid(p, &domain_pol, &sid))
-               return NT_STATUS_INVALID_HANDLE;
-
-       /* append the user's RID to it */
-       if(!sid_append_rid(&sid, user_rid))
-               return NT_STATUS_NO_SUCH_USER;
-
-       /* associate the user's SID with the new handle. */
-       if ((info = (struct samr_info *)malloc(sizeof(struct samr_info))) == NULL)
+       /* associate the user's SID and access bits with the new handle. */
+       if ((info = get_samr_info_by_sid(&sid)) == NULL)
                return NT_STATUS_NO_MEMORY;
-
-       ZERO_STRUCTP(info);
-       info->sid = sid;
+       info->acc_granted = acc_granted;
 
        /* get a (unique) handle.  open a policy on it. */
        if (!create_policy_hnd(p, user_pol, free_samr_info, (void *)info))
@@ -1539,26 +1735,25 @@ NTSTATUS _api_samr_open_user(pipes_struct *p, SAMR_Q_OPEN_USER *q_u, SAMR_R_OPEN
  get_user_info_10. Safe. Only gives out acb bits.
  *************************************************************************/
 
-static BOOL get_user_info_10(SAM_USER_INFO_10 *id10, uint32 user_rid)
+static NTSTATUS get_user_info_10(TALLOC_CTX *mem_ctx, SAM_USER_INFO_10 *id10, DOM_SID *user_sid)
 {
        SAM_ACCOUNT *smbpass=NULL;
        BOOL ret;
+       NTSTATUS nt_status;
 
-       if (!pdb_rid_is_user(user_rid)) {
-               DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
-               return False;
+       nt_status = pdb_init_sam_talloc(mem_ctx, &smbpass);
+       
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               return nt_status;
        }
 
-       pdb_init_sam(&smbpass);
-
        become_root();
-       ret = pdb_getsampwrid(smbpass, user_rid);
+       ret = pdb_getsampwsid(smbpass, user_sid);
        unbecome_root();
 
        if (ret==False) {
-               DEBUG(4,("User 0x%x not found\n", user_rid));
-               pdb_free_sam(&smbpass);
-               return False;
+               DEBUG(4,("User %s not found\n", sid_string_static(user_sid)));
+               return NT_STATUS_NO_SUCH_USER;
        }
 
        DEBUG(3,("User:[%s]\n", pdb_get_username(smbpass) ));
@@ -1566,10 +1761,9 @@ static BOOL get_user_info_10(SAM_USER_INFO_10 *id10, uint32 user_rid)
        ZERO_STRUCTP(id10);
        init_sam_user_info10(id10, pdb_get_acct_ctrl(smbpass) );
 
-       samr_clear_sam_passwd(smbpass);
        pdb_free_sam(&smbpass);
 
-       return True;
+       return NT_STATUS_OK;
 }
 
 /*************************************************************************
@@ -1578,10 +1772,11 @@ static BOOL get_user_info_10(SAM_USER_INFO_10 *id10, uint32 user_rid)
  user. JRA. 
  *************************************************************************/
 
-static NTSTATUS get_user_info_12(pipes_struct *p, SAM_USER_INFO_12 * id12, uint32 user_rid)
+static NTSTATUS get_user_info_12(pipes_struct *p, TALLOC_CTX *mem_ctx, SAM_USER_INFO_12 * id12, DOM_SID *user_sid)
 {
        SAM_ACCOUNT *smbpass=NULL;
        BOOL ret;
+       NTSTATUS nt_status;
 
        if (!p->ntlmssp_auth_validated)
                return NT_STATUS_ACCESS_DENIED;
@@ -1592,12 +1787,17 @@ static NTSTATUS get_user_info_12(pipes_struct *p, SAM_USER_INFO_12 * id12, uint3
        /*
         * Do *NOT* do become_root()/unbecome_root() here ! JRA.
         */
-       pdb_init_sam(&smbpass);
 
-       ret = pdb_getsampwrid(smbpass, user_rid);
+       nt_status = pdb_init_sam_talloc(mem_ctx, &smbpass);
+       
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               return nt_status;
+       }
+
+       ret = pdb_getsampwsid(smbpass, user_sid);
 
        if (ret == False) {
-               DEBUG(4, ("User 0x%x not found\n", user_rid));
+               DEBUG(4, ("User %s not found\n", sid_string_static(user_sid)));
                pdb_free_sam(&smbpass);
                return (geteuid() == (uid_t)0) ? NT_STATUS_NO_SUCH_USER : NT_STATUS_ACCESS_DENIED;
        }
@@ -1621,26 +1821,20 @@ static NTSTATUS get_user_info_12(pipes_struct *p, SAM_USER_INFO_12 * id12, uint3
  get_user_info_20
  *************************************************************************/
 
-static BOOL get_user_info_20(SAM_USER_INFO_20 *id20, uint32 user_rid)
+static NTSTATUS get_user_info_20(TALLOC_CTX *mem_ctx, SAM_USER_INFO_20 *id20, DOM_SID *user_sid)
 {
        SAM_ACCOUNT *sampass=NULL;
        BOOL ret;
 
-       if (!pdb_rid_is_user(user_rid)) {
-               DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
-               return False;
-       }
-
-       pdb_init_sam(&sampass);
+       pdb_init_sam_talloc(mem_ctx, &sampass);
 
        become_root();
-       ret = pdb_getsampwrid(sampass, user_rid);
+       ret = pdb_getsampwsid(sampass, user_sid);
        unbecome_root();
 
        if (ret == False) {
-               DEBUG(4,("User 0x%x not found\n", user_rid));
-               pdb_free_sam(&sampass);
-               return False;
+               DEBUG(4,("User %s not found\n", sid_string_static(user_sid)));
+               return NT_STATUS_NO_SUCH_USER;
        }
 
        samr_clear_sam_passwd(sampass);
@@ -1652,33 +1846,32 @@ static BOOL get_user_info_20(SAM_USER_INFO_20 *id20, uint32 user_rid)
        
        pdb_free_sam(&sampass);
 
-       return True;
+       return NT_STATUS_OK;
 }
 
 /*************************************************************************
  get_user_info_21
  *************************************************************************/
 
-static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
+static NTSTATUS get_user_info_21(TALLOC_CTX *mem_ctx, SAM_USER_INFO_21 *id21, 
+                                DOM_SID *user_sid, DOM_SID *domain_sid)
 {
        SAM_ACCOUNT *sampass=NULL;
        BOOL ret;
+       NTSTATUS nt_status;
 
-       if (!pdb_rid_is_user(user_rid)) {
-               DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
-               return False;
+       nt_status = pdb_init_sam_talloc(mem_ctx, &sampass);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               return nt_status;
        }
 
-       pdb_init_sam(&sampass);
-
        become_root();
-       ret = pdb_getsampwrid(sampass, user_rid);
+       ret = pdb_getsampwsid(sampass, user_sid);
        unbecome_root();
 
        if (ret == False) {
-               DEBUG(4,("User 0x%x not found\n", user_rid));
-               pdb_free_sam(&sampass);
-               return False;
+               DEBUG(4,("User %s not found\n", sid_string_static(user_sid)));
+               return NT_STATUS_NO_SUCH_USER;
        }
 
        samr_clear_sam_passwd(sampass);
@@ -1686,11 +1879,11 @@ static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
        DEBUG(3,("User:[%s]\n",  pdb_get_username(sampass) ));
 
        ZERO_STRUCTP(id21);
-       init_sam_user_info21A(id21, sampass);
+       nt_status = init_sam_user_info21A(id21, sampass, domain_sid);
        
        pdb_free_sam(&sampass);
 
-       return True;
+       return NT_STATUS_OK;
 }
 
 /*******************************************************************
@@ -1700,20 +1893,24 @@ static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
 NTSTATUS _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_R_QUERY_USERINFO *r_u)
 {
        SAM_USERINFO_CTR *ctr;
-       uint32 rid = 0;
        struct samr_info *info = NULL;
-
+       DOM_SID domain_sid;
+       uint32 rid;
+       
        r_u->status=NT_STATUS_OK;
 
        /* search for the handle */
        if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       /* find the user's rid */
-       if ((rid = get_lsa_policy_samr_rid(info)) == 0xffffffff)
+       domain_sid = info->sid;
+
+       sid_split_rid(&domain_sid, &rid);
+
+       if (!sid_check_is_in_our_domain(&info->sid))
                return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-       DEBUG(5,("_samr_query_userinfo: rid:0x%x\n", rid));
+       DEBUG(5,("_samr_query_userinfo: sid:%s\n", sid_string_static(&info->sid)));
 
        ctr = (SAM_USERINFO_CTR *)talloc_zero(p->mem_ctx, sizeof(SAM_USERINFO_CTR));
        if (!ctr)
@@ -1730,8 +1927,8 @@ NTSTATUS _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_
                if (ctr->info.id10 == NULL)
                        return NT_STATUS_NO_MEMORY;
 
-               if (!get_user_info_10(ctr->info.id10, rid))
-                       return NT_STATUS_NO_SUCH_USER;
+               if (!NT_STATUS_IS_OK(r_u->status = get_user_info_10(p->mem_ctx, ctr->info.id10, &info->sid)))
+                       return r_u->status;
                break;
 
 #if 0
@@ -1765,24 +1962,25 @@ NTSTATUS _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_
                if (ctr->info.id12 == NULL)
                        return NT_STATUS_NO_MEMORY;
 
-               if (NT_STATUS_IS_ERR(r_u->status = get_user_info_12(p, ctr->info.id12, rid)))
+               if (!NT_STATUS_IS_OK(r_u->status = get_user_info_12(p, p->mem_ctx, ctr->info.id12, &info->sid)))
                        return r_u->status;
                break;
-
+               
        case 20:
                ctr->info.id20 = (SAM_USER_INFO_20 *)talloc_zero(p->mem_ctx,sizeof(SAM_USER_INFO_20));
                if (ctr->info.id20 == NULL)
                        return NT_STATUS_NO_MEMORY;
-               if (!get_user_info_20(ctr->info.id20, rid))
-                       return NT_STATUS_NO_SUCH_USER;
+               if (!NT_STATUS_IS_OK(r_u->status = get_user_info_20(p->mem_ctx, ctr->info.id20, &info->sid)))
+                       return r_u->status;
                break;
 
        case 21:
                ctr->info.id21 = (SAM_USER_INFO_21 *)talloc_zero(p->mem_ctx,sizeof(SAM_USER_INFO_21));
                if (ctr->info.id21 == NULL)
                        return NT_STATUS_NO_MEMORY;
-               if (!get_user_info_21(ctr->info.id21, rid))
-                       return NT_STATUS_NO_SUCH_USER;
+               if (!NT_STATUS_IS_OK(r_u->status = get_user_info_21(p->mem_ctx, ctr->info.id21, 
+                                                                   &info->sid, &domain_sid)))
+                       return r_u->status;
                break;
 
        default:
@@ -1792,7 +1990,7 @@ NTSTATUS _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_
        init_samr_r_query_userinfo(r_u, ctr, r_u->status);
 
        DEBUG(5,("_samr_query_userinfo: %d\n", __LINE__));
-
+       
        return r_u->status;
 }
 
@@ -1803,47 +2001,62 @@ NTSTATUS _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_
 NTSTATUS _samr_query_usergroups(pipes_struct *p, SAMR_Q_QUERY_USERGROUPS *q_u, SAMR_R_QUERY_USERGROUPS *r_u)
 {
        SAM_ACCOUNT *sam_pass=NULL;
+       DOM_SID  sid;
        DOM_GID *gids = NULL;
        int num_groups = 0;
-       pstring groups;
-       uint32 rid;
-       struct samr_info *info = NULL;
+       uint32 acc_granted;
        BOOL ret;
 
+       /*
+        * from the SID in the request:
+        * we should send back the list of DOMAIN GROUPS
+        * the user is a member of
+        *
+        * and only the DOMAIN GROUPS
+        * no ALIASES !!! neither aliases of the domain
+        * nor aliases of the builtin SID
+        *
+        * JFM, 12/2/2001
+        */
+
        r_u->status = NT_STATUS_OK;
 
        DEBUG(5,("_samr_query_usergroups: %d\n", __LINE__));
 
        /* find the policy handle.  open a policy on it. */
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
+       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
+       
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_USER_GET_GROUPS, "_samr_query_usergroups"))) {
+               return r_u->status;
+       }
 
-       /* find the user's rid */
-       if ((rid = get_lsa_policy_samr_rid(info)) == 0xffffffff)
+       if (!sid_check_is_in_our_domain(&sid))
                return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
        pdb_init_sam(&sam_pass);
-
+       
        become_root();
-       ret = pdb_getsampwrid(sam_pass, rid);
+       ret = pdb_getsampwsid(sam_pass, &sid);
        unbecome_root();
 
        if (ret == False) {
-               samr_clear_sam_passwd(sam_pass);
+               pdb_free_sam(&sam_pass);
                return NT_STATUS_NO_SUCH_USER;
        }
-
-       get_domain_user_groups(groups, pdb_get_username(sam_pass));
-       gids = NULL;
-       num_groups = make_dom_gids(p->mem_ctx, groups, &gids);
-
+       
+       if(!get_domain_user_groups(p->mem_ctx, &num_groups, &gids, sam_pass)) {
+               pdb_free_sam(&sam_pass);
+               return NT_STATUS_NO_SUCH_GROUP;
+       }
+       
        /* construct the response.  lkclXXXX: gids are not copied! */
        init_samr_r_query_usergroups(r_u, num_groups, gids, r_u->status);
-
+       
        DEBUG(5,("_samr_query_usergroups: %d\n", __LINE__));
        
-       samr_clear_sam_passwd(sam_pass);
-
+       pdb_free_sam(&sam_pass);
+       
        return r_u->status;
 }
 
@@ -1853,53 +2066,122 @@ NTSTATUS _samr_query_usergroups(pipes_struct *p, SAMR_Q_QUERY_USERGROUPS *q_u, S
 
 NTSTATUS _samr_query_dom_info(pipes_struct *p, SAMR_Q_QUERY_DOMAIN_INFO *q_u, SAMR_R_QUERY_DOMAIN_INFO *r_u)
 {
-    SAM_UNK_CTR *ctr;
+       struct samr_info *info = NULL;
+       SAM_UNK_CTR *ctr;
+       uint32 min_pass_len,pass_hist,flag;
+       time_t u_expire, u_min_age;
+       NTTIME nt_expire, nt_min_age;
+
+       time_t u_lock_duration, u_reset_time;
+       NTTIME nt_lock_duration, nt_reset_time;
+       uint32 lockout;
+       
+       time_t u_logout;
+       NTTIME nt_logout;
+
+       uint32 account_policy_temp;
+
+       uint32 num_users=0, num_groups=0, num_aliases=0;
 
        if ((ctr = (SAM_UNK_CTR *)talloc_zero(p->mem_ctx, sizeof(SAM_UNK_CTR))) == NULL)
                return NT_STATUS_NO_MEMORY;
 
-    ZERO_STRUCTP(ctr);
+       ZERO_STRUCTP(ctr);
 
-    r_u->status = NT_STATUS_OK;
+       r_u->status = NT_STATUS_OK;
+       
+       DEBUG(5,("_samr_query_dom_info: %d\n", __LINE__));
+       
+       /* find the policy handle.  open a policy on it. */
+       if (!find_policy_by_hnd(p, &q_u->domain_pol, (void **)&info))
+               return NT_STATUS_INVALID_HANDLE;
+       
+       switch (q_u->switch_value) {
+               case 0x01:
+                       
+                       account_policy_get(AP_MIN_PASSWORD_LEN, &account_policy_temp);
+                       min_pass_len = account_policy_temp;
 
-    DEBUG(5,("_samr_query_dom_info: %d\n", __LINE__));
+                       account_policy_get(AP_PASSWORD_HISTORY, &account_policy_temp);
+                       pass_hist = account_policy_temp;
 
-    /* find the policy handle.  open a policy on it. */
-    if (!find_policy_by_hnd(p, &q_u->domain_pol, NULL))
-        return NT_STATUS_INVALID_HANDLE;
+                       account_policy_get(AP_USER_MUST_LOGON_TO_CHG_PASS, &account_policy_temp);
+                       flag = account_policy_temp;
 
-    switch (q_u->switch_value) {
-        case 0x01:
-            init_unk_info1(&ctr->info.inf1);
-            break;
-        case 0x02:
+                       account_policy_get(AP_MAX_PASSWORD_AGE, &account_policy_temp);
+                       u_expire = account_policy_temp;
+
+                       account_policy_get(AP_MIN_PASSWORD_AGE, &account_policy_temp);
+                       u_min_age = account_policy_temp;
+                       
+                       unix_to_nt_time_abs(&nt_expire, u_expire);
+                       unix_to_nt_time_abs(&nt_min_age, u_min_age);
+
+                       init_unk_info1(&ctr->info.inf1, (uint16)min_pass_len, (uint16)pass_hist, 
+                                      flag, nt_expire, nt_min_age);
+                       break;
+               case 0x02:
+                       become_root();          
+                       r_u->status=load_sampwd_entries(info, ACB_NORMAL, False);
+                       unbecome_root();
+                       if (!NT_STATUS_IS_OK(r_u->status)) {
+                               DEBUG(5, ("_samr_query_dispinfo: load_sampwd_entries failed\n"));
+                               return r_u->status;
+                       }
+                       num_users=info->disp_info.num_user_account;
+                       free_samr_db(info);
+                       
+                       r_u->status=load_group_domain_entries(info, get_global_sam_sid());
+                       if (!NT_STATUS_IS_OK(r_u->status)) {
+                               DEBUG(5, ("_samr_query_dispinfo: load_group_domain_entries failed\n"));
+                               return r_u->status;
+                       }
+                       num_groups=info->disp_info.num_group_account;
+                       free_samr_db(info);
+                       
                        /* The time call below is to get a sequence number for the sam. FIXME !!! JRA. */
-            init_unk_info2(&ctr->info.inf2, global_myworkgroup, global_myname, (uint32) time(NULL));
-            break;
-        case 0x03:
-            init_unk_info3(&ctr->info.inf3);
-            break;
-        case 0x05:
-            init_unk_info5(&ctr->info.inf5, global_myname);
-            break;
-        case 0x06:
-            init_unk_info6(&ctr->info.inf6);
-            break;
-        case 0x07:
-            init_unk_info7(&ctr->info.inf7);
-            break;
-        case 0x0c:
-            init_unk_info12(&ctr->info.inf12);
-            break;
-        default:
-            return NT_STATUS_INVALID_INFO_CLASS;
-    }
+                       init_unk_info2(&ctr->info.inf2, lp_workgroup(), global_myname(), (uint32) time(NULL), 
+                                      num_users, num_groups, num_aliases);
+                       break;
+               case 0x03:
+                       account_policy_get(AP_TIME_TO_LOGOUT, (int *)&u_logout);
+                       unix_to_nt_time_abs(&nt_logout, u_logout);
+                       
+                       init_unk_info3(&ctr->info.inf3, nt_logout);
+                       break;
+               case 0x05:
+                       init_unk_info5(&ctr->info.inf5, global_myname());
+                       break;
+               case 0x06:
+                       init_unk_info6(&ctr->info.inf6);
+                       break;
+               case 0x07:
+                       init_unk_info7(&ctr->info.inf7);
+                       break;
+               case 0x0c:
+                       account_policy_get(AP_LOCK_ACCOUNT_DURATION, &account_policy_temp);
+                       u_lock_duration = account_policy_temp;
 
-    init_samr_r_query_dom_info(r_u, q_u->switch_value, ctr, NT_STATUS_OK);
+                       account_policy_get(AP_RESET_COUNT_TIME, &account_policy_temp);
+                       u_reset_time = account_policy_temp;
 
-    DEBUG(5,("_samr_query_dom_info: %d\n", __LINE__));
+                       account_policy_get(AP_BAD_ATTEMPT_LOCKOUT, &account_policy_temp);
+                       lockout = account_policy_temp;
 
-    return r_u->status;
+                       unix_to_nt_time_abs(&nt_lock_duration, u_lock_duration);
+                       unix_to_nt_time_abs(&nt_reset_time, u_reset_time);
+       
+                       init_unk_info12(&ctr->info.inf12, nt_lock_duration, nt_reset_time, (uint16)lockout);
+                       break;
+               default:
+                       return NT_STATUS_INVALID_INFO_CLASS;
+               }
+       
+       init_samr_r_query_dom_info(r_u, q_u->switch_value, ctr, NT_STATUS_OK);
+       
+       DEBUG(5,("_samr_query_dom_info: %d\n", __LINE__));
+       
+       return r_u->status;
 }
 
 /*******************************************************************
@@ -1912,9 +2194,6 @@ NTSTATUS _api_samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_
 {
        SAM_ACCOUNT *sam_pass=NULL;
        fstring account;
-       pstring err_str;
-       pstring msg_str;
-       int local_flags=0;
        DOM_SID sid;
        pstring add_script;
        POLICY_HND dom_pol = q_u->domain_pol;
@@ -1923,11 +2202,22 @@ NTSTATUS _api_samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_
        POLICY_HND *user_pol = &r_u->user_pol;
        struct samr_info *info = NULL;
        BOOL ret;
+       NTSTATUS nt_status;
+       struct passwd *pw;
+       uint32 acc_granted;
+       SEC_DESC *psd;
+       size_t    sd_size;
+       /* check this, when giving away 'add computer to domain' privs */
+       uint32    des_access = GENERIC_RIGHTS_USER_ALL_ACCESS;
 
-       /* find the policy handle.  open a policy on it. */
-       if (!find_policy_by_hnd(p, &dom_pol, NULL))
+       /* Get the domain SID stored in the domain policy */
+       if (!get_lsa_policy_samr_sid(p, &dom_pol, &sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
 
+       if (!NT_STATUS_IS_OK(nt_status = access_check_samr_function(acc_granted, SA_RIGHT_DOMAIN_CREATE_USER, "_samr_create_user"))) {
+               return nt_status;
+       }
+
        /* find the account: tell the caller if it exists.
          lkclXXXX i have *no* idea if this is a problem or not
          or even if you are supposed to construct a different
@@ -1948,8 +2238,7 @@ NTSTATUS _api_samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_
                return NT_STATUS_USER_EXISTS;
        }
 
-       local_flags=LOCAL_ADD_USER|LOCAL_DISABLE_USER|LOCAL_SET_NO_PASSWORD;
-       local_flags|= (acb_info & ACB_WSTRUST) ? LOCAL_TRUST_ACCOUNT:0;
+       pdb_free_sam(&sam_pass);
 
        /*
         * NB. VERY IMPORTANT ! This call must be done as the current pipe user,
@@ -1973,7 +2262,7 @@ NTSTATUS _api_samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_
         */
 
        DEBUG(10,("checking account %s at pos %d for $ termination\n",account, strlen(account)-1));
-
+#if 0
        if ((acb_info & ACB_WSTRUST) && (account[strlen(account)-1] == '$')) {
                pstrcpy(add_script, lp_addmachine_script());            
        } else if ((!(acb_info & ACB_WSTRUST)) && (account[strlen(account)-1] != '$')) {
@@ -1983,51 +2272,68 @@ NTSTATUS _api_samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_
                pdb_free_sam(&sam_pass);
                return NT_STATUS_UNSUCCESSFUL;
        }
+#endif
 
-       if(*add_script) {
-               int add_ret;
-               all_string_sub(add_script, "%u", account, sizeof(account));
-               add_ret = smbrun(add_script,NULL);
-               DEBUG(3,("_api_samr_create_user: Running the command `%s' gave %d\n",add_script,add_ret));
-       }
-
-       /* add the user in the smbpasswd file or the Samba authority database */
-       if (!local_password_change(account, local_flags, NULL, err_str,
-           sizeof(err_str), msg_str, sizeof(msg_str))) {
-               DEBUG(0, ("%s\n", err_str));
-               pdb_free_sam(&sam_pass);
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       become_root();
-       ret = pdb_getsampwnam(sam_pass, account);
-       unbecome_root();
-       if (ret == False) {
-               /* account doesn't exist: say so */
-               pdb_free_sam(&sam_pass);
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       /* Get the domain SID stored in the domain policy */
-       if(!get_lsa_policy_samr_sid(p, &dom_pol, &sid)) {
-               pdb_free_sam(&sam_pass);
-               return NT_STATUS_INVALID_HANDLE;
+       /* the passdb lookup has failed; check to see if we need to run the
+          add user/machine script */
+          
+       pw = Get_Pwnam(account);
+       
+       if ( !pw ) {
+               /* 
+                * we can't check both the ending $ and the acb_info.
+                * 
+                * UserManager creates trust accounts (ending in $,
+                * normal that hidden accounts) with the acb_info equals to ACB_NORMAL.
+                * JFM, 11/29/2001
+                */
+               if (account[strlen(account)-1] == '$')
+                       pstrcpy(add_script, lp_addmachine_script());            
+               else 
+                       pstrcpy(add_script, lp_adduser_script());
+
+               if (*add_script) {
+                       int add_ret;
+                       all_string_sub(add_script, "%u", account, sizeof(account));
+                       add_ret = smbrun(add_script,NULL);
+                       DEBUG(3,("_api_samr_create_user: Running the command `%s' gave %d\n", add_script, add_ret));
+               }
+               
        }
-
-       /* append the user's RID to it */
-       if(!sid_append_rid(&sid, pdb_get_user_rid(sam_pass) )) {
-               pdb_free_sam(&sam_pass);
-               return NT_STATUS_NO_SUCH_USER;
+       
+       nt_status = pdb_init_sam_new(&sam_pass, account);
+       if (!NT_STATUS_IS_OK(nt_status))
+               return nt_status;
+               
+       pdb_set_acct_ctrl(sam_pass, acb_info, PDB_CHANGED);
+       
+       if (!pdb_add_sam_account(sam_pass)) {
+               pdb_free_sam(&sam_pass);
+               DEBUG(0, ("could not add user/computer %s to passdb.  Check permissions?\n", 
+                         account));
+               return NT_STATUS_ACCESS_DENIED;         
+       }
+       
+       /* Get the user's SID */
+       sid_copy(&sid, pdb_get_user_sid(sam_pass));
+       
+       samr_make_usr_obj_sd(p->mem_ctx, &psd, &sd_size, &sid);
+       se_map_generic(&des_access, &usr_generic_mapping);
+       if (!NT_STATUS_IS_OK(nt_status = 
+                            access_check_samr_object(psd, p->pipe_user.nt_user_token, 
+                                                     des_access, &acc_granted, "_samr_create_user"))) {
+               return nt_status;
        }
 
        /* associate the user's SID with the new handle. */
-       if ((info = (struct samr_info *)malloc(sizeof(struct samr_info))) == NULL) {
+       if ((info = get_samr_info_by_sid(&sid)) == NULL) {
                pdb_free_sam(&sam_pass);
                return NT_STATUS_NO_MEMORY;
        }
 
        ZERO_STRUCTP(info);
        info->sid = sid;
+       info->acc_granted = acc_granted;
 
        /* get a (unique) handle.  open a policy on it. */
        if (!create_policy_hnd(p, user_pol, free_samr_info, (void *)info)) {
@@ -2035,8 +2341,9 @@ NTSTATUS _api_samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
-       r_u->user_rid=sam_pass->user_rid;
-       r_u->unknown_0 = 0x000703ff;
+       r_u->user_rid=pdb_get_user_rid(sam_pass);
+
+       r_u->access_granted = acc_granted;
 
        pdb_free_sam(&sam_pass);
 
@@ -2047,54 +2354,133 @@ NTSTATUS _api_samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_
  samr_reply_connect_anon
  ********************************************************************/
 
-NTSTATUS _samr_connect_anon(pipes_struct *p, SAMR_Q_CONNECT_ANON *q_u, SAMR_R_CONNECT_ANON *r_u)
-{
-       struct samr_info *info = NULL;
+NTSTATUS _samr_connect_anon(pipes_struct *p, SAMR_Q_CONNECT_ANON *q_u, SAMR_R_CONNECT_ANON *r_u)
+{
+       struct samr_info *info = NULL;
+
+       /* Access check */
+
+       if (!pipe_access_check(p)) {
+               DEBUG(3, ("access denied to samr_connect_anon\n"));
+               r_u->status = NT_STATUS_ACCESS_DENIED;
+               return r_u->status;
+       }
+
+       /* set up the SAMR connect_anon response */
+
+       r_u->status = NT_STATUS_OK;
+
+       /* associate the user's SID with the new handle. */
+       if ((info = get_samr_info_by_sid(NULL)) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       info->status = q_u->unknown_0;
+
+       /* get a (unique) handle.  open a policy on it. */
+       if (!create_policy_hnd(p, &r_u->connect_pol, free_samr_info, (void *)info))
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+       return r_u->status;
+}
+
+/*******************************************************************
+ samr_reply_connect
+ ********************************************************************/
+
+NTSTATUS _samr_connect(pipes_struct *p, SAMR_Q_CONNECT *q_u, SAMR_R_CONNECT *r_u)
+{
+       struct samr_info *info = NULL;
+       SEC_DESC *psd = NULL;
+       uint32    acc_granted;
+       uint32    des_access = q_u->access_mask;
+       size_t    sd_size;
+       NTSTATUS  nt_status;
+
+
+       DEBUG(5,("_samr_connect: %d\n", __LINE__));
+
+       /* Access check */
+
+       if (!pipe_access_check(p)) {
+               DEBUG(3, ("access denied to samr_connect\n"));
+               r_u->status = NT_STATUS_ACCESS_DENIED;
+               return r_u->status;
+       }
 
-    /* set up the SAMR connect_anon response */
+       samr_make_sam_obj_sd(p->mem_ctx, &psd, &sd_size);
+       se_map_generic(&des_access, &sam_generic_mapping);
+       if (!NT_STATUS_IS_OK(nt_status = 
+                            access_check_samr_object(psd, p->pipe_user.nt_user_token, 
+                                                     des_access, &acc_granted, "_samr_connect"))) {
+               return nt_status;
+       }
 
-    r_u->status = NT_STATUS_OK;
+       r_u->status = NT_STATUS_OK;
 
-    /* associate the user's SID with the new handle. */
-    if ((info = (struct samr_info *)malloc(sizeof(struct samr_info))) == NULL)
-        return NT_STATUS_NO_MEMORY;
+       /* associate the user's SID and access granted with the new handle. */
+       if ((info = get_samr_info_by_sid(NULL)) == NULL)
+               return NT_STATUS_NO_MEMORY;
 
-    ZERO_STRUCTP(info);
-    info->status = q_u->unknown_0;
+       info->acc_granted = acc_granted;
+       info->status = q_u->access_mask;
 
-    /* get a (unique) handle.  open a policy on it. */
-    if (!create_policy_hnd(p, &r_u->connect_pol, free_samr_info, (void *)info))
-        return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       /* get a (unique) handle.  open a policy on it. */
+       if (!create_policy_hnd(p, &r_u->connect_pol, free_samr_info, (void *)info))
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 
-    return r_u->status;
+       DEBUG(5,("_samr_connect: %d\n", __LINE__));
+
+       return r_u->status;
 }
 
 /*******************************************************************
- samr_reply_connect
+ samr_connect4
  ********************************************************************/
 
-NTSTATUS _samr_connect(pipes_struct *p, SAMR_Q_CONNECT *q_u, SAMR_R_CONNECT *r_u)
+NTSTATUS _samr_connect4(pipes_struct *p, SAMR_Q_CONNECT4 *q_u, SAMR_R_CONNECT4 *r_u)
 {
        struct samr_info *info = NULL;
+       SEC_DESC *psd = NULL;
+       uint32    acc_granted;
+       uint32    des_access = q_u->access_mask;
+       size_t    sd_size;
+       NTSTATUS  nt_status;
 
-    DEBUG(5,("_samr_connect: %d\n", __LINE__));
 
-    r_u->status = NT_STATUS_OK;
+       DEBUG(5,("_samr_connect4: %d\n", __LINE__));
 
-    /* associate the user's SID with the new handle. */
-    if ((info = (struct samr_info *)malloc(sizeof(struct samr_info))) == NULL)
-        return NT_STATUS_NO_MEMORY;
+       /* Access check */
 
-    ZERO_STRUCTP(info);
-    info->status = q_u->access_mask;
+       if (!pipe_access_check(p)) {
+               DEBUG(3, ("access denied to samr_connect4\n"));
+               r_u->status = NT_STATUS_ACCESS_DENIED;
+               return r_u->status;
+       }
 
-    /* get a (unique) handle.  open a policy on it. */
-    if (!create_policy_hnd(p, &r_u->connect_pol, free_samr_info, (void *)info))
-        return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       samr_make_sam_obj_sd(p->mem_ctx, &psd, &sd_size);
+       se_map_generic(&des_access, &sam_generic_mapping);
+       if (!NT_STATUS_IS_OK(nt_status = 
+                            access_check_samr_object(psd, p->pipe_user.nt_user_token, 
+                                                     des_access, &acc_granted, "_samr_connect"))) {
+               return nt_status;
+       }
 
-    DEBUG(5,("_samr_connect: %d\n", __LINE__));
+       r_u->status = NT_STATUS_OK;
 
-    return r_u->status;
+       /* associate the user's SID and access granted with the new handle. */
+       if ((info = get_samr_info_by_sid(NULL)) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       info->acc_granted = acc_granted;
+       info->status = q_u->access_mask;
+
+       /* get a (unique) handle.  open a policy on it. */
+       if (!create_policy_hnd(p, &r_u->connect_pol, free_samr_info, (void *)info))
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+       DEBUG(5,("_samr_connect: %d\n", __LINE__));
+
+       return r_u->status;
 }
 
 /**********************************************************************
@@ -2103,16 +2489,32 @@ NTSTATUS _samr_connect(pipes_struct *p, SAMR_Q_CONNECT *q_u, SAMR_R_CONNECT *r_u
 
 NTSTATUS _samr_lookup_domain(pipes_struct *p, SAMR_Q_LOOKUP_DOMAIN *q_u, SAMR_R_LOOKUP_DOMAIN *r_u)
 {
-    r_u->status = NT_STATUS_OK;
+       struct samr_info *info;
+       fstring domain_name;
+       DOM_SID sid;
+
+       r_u->status = NT_STATUS_OK;
 
-    if (!find_policy_by_hnd(p, &q_u->connect_pol, NULL))
-        return NT_STATUS_INVALID_HANDLE;
+       if (!find_policy_by_hnd(p, &q_u->connect_pol, (void**)&info))
+               return NT_STATUS_INVALID_HANDLE;
 
-    /* assume the domain name sent is our global_myname and
-       send global_sam_sid */
-    init_samr_r_lookup_domain(r_u, &global_sam_sid, r_u->status);
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(info->acc_granted, SA_RIGHT_SAM_OPEN_DOMAIN, "_samr_lookup_domain"))) {
+               return r_u->status;
+       }
 
-    return r_u->status;
+       rpcstr_pull(domain_name, q_u->uni_domain.buffer, sizeof(domain_name), q_u->uni_domain.uni_str_len*2, 0);
+
+       ZERO_STRUCT(sid);
+
+       if (!secrets_fetch_domain_sid(domain_name, &sid)) {
+               r_u->status = NT_STATUS_NO_SUCH_DOMAIN;
+       }
+
+       DEBUG(2,("Returning domain sid for domain %s -> %s\n", domain_name, sid_string_static(&sid)));
+
+       init_samr_r_lookup_domain(r_u, &sid, r_u->status);
+
+       return r_u->status;
 }
 
 /******************************************************************
@@ -2159,12 +2561,31 @@ static BOOL make_enum_domains(TALLOC_CTX *ctx, SAM_ENTRY **pp_sam,
 
 NTSTATUS _samr_enum_domains(pipes_struct *p, SAMR_Q_ENUM_DOMAINS *q_u, SAMR_R_ENUM_DOMAINS *r_u)
 {
+       struct samr_info *info;
        uint32 num_entries = 2;
        fstring dom[2];
+       const char *name;
 
        r_u->status = NT_STATUS_OK;
+       
+       if (!find_policy_by_hnd(p, &q_u->pol, (void**)&info))
+               return NT_STATUS_INVALID_HANDLE;
+       
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(info->acc_granted, SA_RIGHT_SAM_ENUM_DOMAINS, "_samr_enum_domains"))) {
+               return r_u->status;
+       }
+
+       switch (lp_server_role()) {
+       case ROLE_DOMAIN_PDC:
+       case ROLE_DOMAIN_BDC:
+               name = lp_workgroup();
+               break;
+       default:
+               name = global_myname();
+       }
 
-       fstrcpy(dom[0],global_myworkgroup);
+       fstrcpy(dom[0],name);
+       strupper(dom[0]);
        fstrcpy(dom[1],"Builtin");
 
        if (!make_enum_domains(p->mem_ctx, &r_u->sam, &r_u->uni_dom_name, num_entries, dom))
@@ -2185,33 +2606,46 @@ NTSTATUS _api_samr_open_alias(pipes_struct *p, SAMR_Q_OPEN_ALIAS *q_u, SAMR_R_OP
        POLICY_HND domain_pol = q_u->dom_pol;
        uint32 alias_rid = q_u->rid_alias;
        POLICY_HND *alias_pol = &r_u->pol;
-       struct samr_info *info = NULL;
+       struct    samr_info *info = NULL;
+       SEC_DESC *psd = NULL;
+       uint32    acc_granted;
+       uint32    des_access = q_u->access_mask;
+       size_t    sd_size;
+       NTSTATUS  status;
 
        r_u->status = NT_STATUS_OK;
 
-       /* get the domain policy. */
-       if (!find_policy_by_hnd(p, &domain_pol, NULL))
-               return NT_STATUS_INVALID_HANDLE;
-
-       /* Get the domain SID stored in the domain policy */
-       if(!get_lsa_policy_samr_sid(p, &domain_pol, &sid))
+       /* find the domain policy and get the SID / access bits stored in the domain policy */
+       if (!get_lsa_policy_samr_sid(p, &domain_pol, &sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
+               
+       if (!NT_STATUS_IS_OK(status = access_check_samr_function(acc_granted, SA_RIGHT_DOMAIN_OPEN_ACCOUNT, "_samr_open_alias"))) {
+               return status;
+       }
 
        /* append the alias' RID to it */
-       if(!sid_append_rid(&sid, alias_rid))
+       if (!sid_append_rid(&sid, alias_rid))
                return NT_STATUS_NO_SUCH_USER;
+               
+       /*check if access can be granted as requested by client. */
+       samr_make_ali_obj_sd(p->mem_ctx, &psd, &sd_size);
+       se_map_generic(&des_access,&ali_generic_mapping);
+       if (!NT_STATUS_IS_OK(status = 
+                            access_check_samr_object(psd, p->pipe_user.nt_user_token, 
+                                                     des_access, &acc_granted, "_samr_open_alias"))) {
+               return status;
+       }
 
        /*
         * we should check if the rid really exist !!!
         * JFM.
         */
 
-    /* associate the user's SID with the new handle. */
-    if ((info = (struct samr_info *)malloc(sizeof(struct samr_info))) == NULL)
-        return NT_STATUS_NO_MEMORY;
-
-    ZERO_STRUCTP(info);
-    info->sid = sid;
+       /* associate the user's SID with the new handle. */
+       if ((info = get_samr_info_by_sid(&sid)) == NULL)
+               return NT_STATUS_NO_MEMORY;
+               
+       info->acc_granted = acc_granted;
 
        /* get a (unique) handle.  open a policy on it. */
        if (!create_policy_hnd(p, alias_pol, free_samr_info, (void *)info))
@@ -2224,14 +2658,14 @@ NTSTATUS _api_samr_open_alias(pipes_struct *p, SAMR_Q_OPEN_ALIAS *q_u, SAMR_R_OP
  set_user_info_10
  ********************************************************************/
 
-static BOOL set_user_info_10(const SAM_USER_INFO_10 *id10, uint32 rid)
+static BOOL set_user_info_10(const SAM_USER_INFO_10 *id10, DOM_SID *sid)
 {
        SAM_ACCOUNT *pwd =NULL;
        BOOL ret;
        
        pdb_init_sam(&pwd);
        
-       ret = pdb_getsampwrid(pwd, rid);
+       ret = pdb_getsampwsid(pwd, sid);
        
        if(ret==False) {
                pdb_free_sam(&pwd);
@@ -2243,13 +2677,14 @@ static BOOL set_user_info_10(const SAM_USER_INFO_10 *id10, uint32 rid)
                pdb_free_sam(&pwd);
                return False;
        }
-
-       if (!pdb_set_acct_ctrl(pwd, id10->acb_info)) {
+       
+       /* FIX ME: check if the value is really changed --metze */
+       if (!pdb_set_acct_ctrl(pwd, id10->acb_info, PDB_CHANGED)) {
                pdb_free_sam(&pwd);
                return False;
        }
 
-       if(!pdb_update_sam_account(pwd, True)) {
+       if(!pdb_update_sam_account(pwd)) {
                pdb_free_sam(&pwd);
                return False;
        }
@@ -2263,13 +2698,13 @@ static BOOL set_user_info_10(const SAM_USER_INFO_10 *id10, uint32 rid)
  set_user_info_12
  ********************************************************************/
 
-static BOOL set_user_info_12(SAM_USER_INFO_12 *id12, uint32 rid)
+static BOOL set_user_info_12(SAM_USER_INFO_12 *id12, DOM_SID *sid)
 {
        SAM_ACCOUNT *pwd = NULL;
 
        pdb_init_sam(&pwd);
 
-       if(!pdb_getsampwrid(pwd, rid)) {
+       if(!pdb_getsampwsid(pwd, sid)) {
                pdb_free_sam(&pwd);
                return False;
        }
@@ -2280,11 +2715,11 @@ static BOOL set_user_info_12(SAM_USER_INFO_12 *id12, uint32 rid)
                return False;
        }
  
-       if (!pdb_set_lanman_passwd (pwd, id12->lm_pwd)) {
+       if (!pdb_set_lanman_passwd (pwd, id12->lm_pwd, PDB_CHANGED)) {
                pdb_free_sam(&pwd);
                return False;
        }
-       if (!pdb_set_nt_passwd     (pwd, id12->nt_pwd)) {
+       if (!pdb_set_nt_passwd     (pwd, id12->nt_pwd, PDB_CHANGED)) {
                pdb_free_sam(&pwd);
                return False;
        }
@@ -2293,7 +2728,7 @@ static BOOL set_user_info_12(SAM_USER_INFO_12 *id12, uint32 rid)
                return False; 
        }
  
-       if(!pdb_update_sam_account(pwd, True)) {
+       if(!pdb_update_sam_account(pwd)) {
                pdb_free_sam(&pwd);
                return False;
        }
@@ -2306,10 +2741,9 @@ static BOOL set_user_info_12(SAM_USER_INFO_12 *id12, uint32 rid)
  set_user_info_21
  ********************************************************************/
 
-static BOOL set_user_info_21(SAM_USER_INFO_21 *id21, uint32 rid)
+static BOOL set_user_info_21(SAM_USER_INFO_21 *id21, DOM_SID *sid)
 {
        SAM_ACCOUNT *pwd = NULL;
-       SAM_ACCOUNT *new_pwd = NULL;
  
        if (id21 == NULL) {
                DEBUG(5, ("set_user_info_21: NULL id21\n"));
@@ -2317,17 +2751,13 @@ static BOOL set_user_info_21(SAM_USER_INFO_21 *id21, uint32 rid)
        }
  
        pdb_init_sam(&pwd);
-       pdb_init_sam(&new_pwd);
  
-       if (!pdb_getsampwrid(pwd, rid)) {
+       if (!pdb_getsampwsid(pwd, sid)) {
                pdb_free_sam(&pwd);
-               pdb_free_sam(&new_pwd);
                return False;
        }
  
-       /* we make a copy so that we can modify stuff */
-       copy_sam_passwd(new_pwd, pwd);
-       copy_id21_to_sam_passwd(new_pwd, id21);
+       copy_id21_to_sam_passwd(pwd, id21);
  
        /*
         * The funny part about the previous two calls is
@@ -2337,14 +2767,12 @@ static BOOL set_user_info_21(SAM_USER_INFO_21 *id21, uint32 rid)
         */
  
        /* write the change out */
-       if(!pdb_update_sam_account(new_pwd, True)) {
+       if(!pdb_update_sam_account(pwd)) {
                pdb_free_sam(&pwd);
-               pdb_free_sam(&new_pwd);
                return False;
        }
 
        pdb_free_sam(&pwd);
-       pdb_free_sam(&new_pwd);
 
        return True;
 }
@@ -2353,10 +2781,9 @@ static BOOL set_user_info_21(SAM_USER_INFO_21 *id21, uint32 rid)
  set_user_info_23
  ********************************************************************/
 
-static BOOL set_user_info_23(SAM_USER_INFO_23 *id23, uint32 rid)
+static BOOL set_user_info_23(SAM_USER_INFO_23 *id23, DOM_SID *sid)
 {
        SAM_ACCOUNT *pwd = NULL;
-       SAM_ACCOUNT *new_pwd = NULL;
        pstring plaintext_buf;
        uint32 len;
        uint16 acct_ctrl;
@@ -2367,53 +2794,51 @@ static BOOL set_user_info_23(SAM_USER_INFO_23 *id23, uint32 rid)
        }
  
        pdb_init_sam(&pwd);
-       pdb_init_sam(&new_pwd);
  
-       if (!pdb_getsampwrid(pwd, rid)) {
+       if (!pdb_getsampwsid(pwd, sid)) {
                pdb_free_sam(&pwd);
-               pdb_free_sam(&new_pwd);
                return False;
        }
 
+       DEBUG(5, ("Attempting administrator password change (level 23) for user %s\n",
+                 pdb_get_username(pwd)));
+
        acct_ctrl = pdb_get_acct_ctrl(pwd);
 
-       copy_sam_passwd(new_pwd, pwd);
-       pdb_free_sam(&pwd);
-       
-       copy_id23_to_sam_passwd(new_pwd, id23);
        if (!decode_pw_buffer((char*)id23->pass, plaintext_buf, 256, &len)) {
-               pdb_free_sam(&new_pwd);
+               pdb_free_sam(&pwd);
                return False;
        }
   
-       if (!pdb_set_plaintext_passwd (new_pwd, plaintext_buf)) {
-               pdb_free_sam(&new_pwd);
+       if (!pdb_set_plaintext_passwd (pwd, plaintext_buf)) {
+               pdb_free_sam(&pwd);
                return False;
        }
  
+       copy_id23_to_sam_passwd(pwd, id23);
        /* if it's a trust account, don't update /etc/passwd */
-       if ( ( (acct_ctrl &  ACB_DOMTRUST) == ACB_DOMTRUST ) ||
-            ( (acct_ctrl &  ACB_WSTRUST) ==  ACB_WSTRUST) ||
-            ( (acct_ctrl &  ACB_SVRTRUST) ==  ACB_SVRTRUST) ) {
-            DEBUG(5, ("Changing trust account password, not updating /etc/passwd\n"));
+       if (    ( (acct_ctrl &  ACB_DOMTRUST) == ACB_DOMTRUST ) ||
+               ( (acct_ctrl &  ACB_WSTRUST) ==  ACB_WSTRUST) ||
+               ( (acct_ctrl &  ACB_SVRTRUST) ==  ACB_SVRTRUST) ) {
+               DEBUG(5, ("Changing trust account or non-unix-user password, not updating /etc/passwd\n"));
        } else  {
                /* update the UNIX password */
                if (lp_unix_password_sync() )
-                       if(!chgpasswd(pdb_get_username(new_pwd), "", plaintext_buf, True)) {
-                               pdb_free_sam(&new_pwd);
+                       if(!chgpasswd(pdb_get_username(pwd), "", plaintext_buf, True)) {
+                               pdb_free_sam(&pwd);
                                return False;
                        }
        }
  
        ZERO_STRUCT(plaintext_buf);
  
-       if(!pdb_update_sam_account(new_pwd, True)) {
-               pdb_free_sam(&new_pwd);
+       if(!pdb_update_sam_account(pwd)) {
+               pdb_free_sam(&pwd);
                return False;
        }
  
-       pdb_free_sam(&new_pwd);
+       pdb_free_sam(&pwd);
 
        return True;
 }
@@ -2422,7 +2847,7 @@ static BOOL set_user_info_23(SAM_USER_INFO_23 *id23, uint32 rid)
  set_user_info_pw
  ********************************************************************/
 
-static BOOL set_user_info_pw(char *pass, uint32 rid)
+static BOOL set_user_info_pw(char *pass, DOM_SID *sid)
 {
        SAM_ACCOUNT *pwd = NULL;
        uint32 len;
@@ -2431,11 +2856,14 @@ static BOOL set_user_info_pw(char *pass, uint32 rid)
  
        pdb_init_sam(&pwd);
  
-       if (!pdb_getsampwrid(pwd, rid)) {
+       if (!pdb_getsampwsid(pwd, sid)) {
                pdb_free_sam(&pwd);
                return False;
        }
        
+       DEBUG(5, ("Attempting administrator password change for user %s\n",
+                 pdb_get_username(pwd)));
+
        acct_ctrl = pdb_get_acct_ctrl(pwd);
 
        ZERO_STRUCT(plaintext_buf);
@@ -2452,24 +2880,25 @@ static BOOL set_user_info_pw(char *pass, uint32 rid)
  
        /* if it's a trust account, don't update /etc/passwd */
        if ( ( (acct_ctrl &  ACB_DOMTRUST) == ACB_DOMTRUST ) ||
-            ( (acct_ctrl &  ACB_WSTRUST) ==  ACB_WSTRUST) ||
-            ( (acct_ctrl &  ACB_SVRTRUST) ==  ACB_SVRTRUST) ) {
-            DEBUG(5, ("Changing trust account password, not updating /etc/passwd\n"));
+               ( (acct_ctrl &  ACB_WSTRUST) ==  ACB_WSTRUST) ||
+               ( (acct_ctrl &  ACB_SVRTRUST) ==  ACB_SVRTRUST) ) {
+               DEBUG(5, ("Changing trust account or non-unix-user password, not updating /etc/passwd\n"));
        } else {
                /* update the UNIX password */
-               if (lp_unix_password_sync())
+               if (lp_unix_password_sync()) {
                        if(!chgpasswd(pdb_get_username(pwd), "", plaintext_buf, True)) {
                                pdb_free_sam(&pwd);
                                return False;
                        }
+               }
        }
  
        ZERO_STRUCT(plaintext_buf);
  
-       DEBUG(5,("set_user_info_pw: pdb_update_sam_account()\n"));
+       DEBUG(5,("set_user_info_pw: pdb_update_pwd()\n"));
  
        /* update the SAMBA password */
-       if(!pdb_update_sam_account(pwd, True)) {
+       if(!pdb_update_sam_account(pwd)) {
                pdb_free_sam(&pwd);
                return False;
        }
@@ -2485,76 +2914,46 @@ static BOOL set_user_info_pw(char *pass, uint32 rid)
 
 NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SET_USERINFO *r_u)
 {
-       uint32 rid = 0x0;
        DOM_SID sid;
-       struct current_user user;
-       SAM_ACCOUNT *sam_pass=NULL;
-       unsigned char sess_key[16];
        POLICY_HND *pol = &q_u->pol;
        uint16 switch_value = q_u->switch_value;
        SAM_USERINFO_CTR *ctr = q_u->ctr;
-       BOOL ret;
+       uint32 acc_granted;
+       uint32 acc_required;
 
        DEBUG(5, ("_samr_set_userinfo: %d\n", __LINE__));
 
        r_u->status = NT_STATUS_OK;
 
-       if (p->ntlmssp_auth_validated)  {
-               memcpy(&user, &p->pipe_user, sizeof(user));
-       } else  {
-               extern struct current_user current_user;
-               memcpy(&user, &current_user, sizeof(user));
-       }
-
        /* find the policy handle.  open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, pol, &sid))
+       if (!get_lsa_policy_samr_sid(p, pol, &sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
-
-       sid_split_rid(&sid, &rid);
-
-       DEBUG(5, ("_samr_set_userinfo: rid:0x%x, level:%d\n", rid, switch_value));
+       
+       acc_required = SA_RIGHT_USER_SET_LOC_COM | SA_RIGHT_USER_SET_ATTRIBUTES; /* This is probably wrong */   
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, acc_required, "_samr_set_userinfo"))) {
+               return r_u->status;
+       }
+               
+       DEBUG(5, ("_samr_set_userinfo: sid:%s, level:%d\n", sid_string_static(&sid), switch_value));
 
        if (ctr == NULL) {
                DEBUG(5, ("_samr_set_userinfo: NULL info level\n"));
                return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-
-       pdb_init_sam(&sam_pass);
-
-       /* 
-        * We need the NT hash of the user who is changing the user's password.
-        * This NT hash is used to generate a "user session key"
-        * This "user session key" is in turn used to encrypt/decrypt the user's password.
-        */
-
-       become_root();
-       ret = pdb_getsampwuid(sam_pass, user.uid);
-       unbecome_root();
-       if(ret == False) {
-               DEBUG(0,("_samr_set_userinfo: Unable to get smbpasswd entry for uid %u\n", (unsigned int)user.uid ));
-               pdb_free_sam(&sam_pass);
-               return NT_STATUS_ACCESS_DENIED;
-       }
-               
-       memset(sess_key, '\0', 16);
-       mdfour(sess_key, pdb_get_nt_passwd(sam_pass), 16);
-
-       pdb_free_sam(&sam_pass);
-
        /* ok!  user info levels (lots: see MSDEV help), off we go... */
        switch (switch_value) {
                case 0x12:
-                       if (!set_user_info_12(ctr->info.id12, rid))
+                       if (!set_user_info_12(ctr->info.id12, &sid))
                                return NT_STATUS_ACCESS_DENIED;
                        break;
 
                case 24:
-                       SamOEMhash(ctr->info.id24->pass, sess_key, 516);
+                       SamOEMhash(ctr->info.id24->pass, p->session_key, 516);
 
                        dump_data(100, (char *)ctr->info.id24->pass, 516);
 
-                       if (!set_user_info_pw((char *)ctr->info.id24->pass, rid))
+                       if (!set_user_info_pw((char *)ctr->info.id24->pass, &sid))
                                return NT_STATUS_ACCESS_DENIED;
                        break;
 
@@ -2568,22 +2967,22 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE
                         * info level and W2K SP2 drops down to level 23... JRA.
                         */
 
-                       SamOEMhash(ctr->info.id25->pass, sess_key, 532);
+                       SamOEMhash(ctr->info.id25->pass, p->session_key, 532);
 
                        dump_data(100, (char *)ctr->info.id25->pass, 532);
 
-                       if (!set_user_info_pw(ctr->info.id25->pass, rid))
+                       if (!set_user_info_pw(ctr->info.id25->pass, &sid))
                                return NT_STATUS_ACCESS_DENIED;
                        break;
 #endif
                        return NT_STATUS_INVALID_INFO_CLASS;
 
                case 23:
-                       SamOEMhash(ctr->info.id23->pass, sess_key, 516);
+                       SamOEMhash(ctr->info.id23->pass, p->session_key, 516);
 
                        dump_data(100, (char *)ctr->info.id23->pass, 516);
 
-                       if (!set_user_info_23(ctr->info.id23, rid))
+                       if (!set_user_info_23(ctr->info.id23, &sid))
                                return NT_STATUS_ACCESS_DENIED;
                        break;
 
@@ -2601,22 +3000,26 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE
 NTSTATUS _samr_set_userinfo2(pipes_struct *p, SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_SET_USERINFO2 *r_u)
 {
        DOM_SID sid;
-       uint32 rid = 0x0;
        SAM_USERINFO_CTR *ctr = q_u->ctr;
        POLICY_HND *pol = &q_u->pol;
        uint16 switch_value = q_u->switch_value;
+       uint32 acc_granted;
+       uint32 acc_required;
 
        DEBUG(5, ("samr_reply_set_userinfo2: %d\n", __LINE__));
 
        r_u->status = NT_STATUS_OK;
 
        /* find the policy handle.  open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, pol, &sid))
+       if (!get_lsa_policy_samr_sid(p, pol, &sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
+       
+       acc_required = SA_RIGHT_USER_SET_LOC_COM | SA_RIGHT_USER_SET_ATTRIBUTES; /* This is probably wrong */   
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, acc_required, "_samr_set_userinfo2"))) {
+               return r_u->status;
+       }
 
-       sid_split_rid(&sid, &rid);
-
-       DEBUG(5, ("samr_reply_set_userinfo2: rid:0x%x\n", rid));
+       DEBUG(5, ("samr_reply_set_userinfo2: sid:%s\n", sid_string_static(&sid)));
 
        if (ctr == NULL) {
                DEBUG(5, ("samr_reply_set_userinfo2: NULL info level\n"));
@@ -2628,16 +3031,16 @@ NTSTATUS _samr_set_userinfo2(pipes_struct *p, SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_
        /* ok!  user info levels (lots: see MSDEV help), off we go... */
        switch (switch_value) {
                case 21:
-                       if (!set_user_info_21(ctr->info.id21, rid))
+                       if (!set_user_info_21(ctr->info.id21, &sid))
                                return NT_STATUS_ACCESS_DENIED;
                        break;
                case 16:
-                       if (!set_user_info_10(ctr->info.id10, rid))
+                       if (!set_user_info_10(ctr->info.id10, &sid))
                                return NT_STATUS_ACCESS_DENIED;
                        break;
                case 18:
                        /* Used by AS/U JRA. */
-                       if (!set_user_info_12(ctr->info.id12, rid))
+                       if (!set_user_info_12(ctr->info.id12, &sid))
                                return NT_STATUS_ACCESS_DENIED;
                        break;
                default:
@@ -2653,22 +3056,89 @@ NTSTATUS _samr_set_userinfo2(pipes_struct *p, SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_
 
 NTSTATUS _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES *q_u, SAMR_R_QUERY_USERALIASES *r_u)
 {
-       uint32 *rid=NULL;
-       int num_rids;
+       int num_groups = 0, tmp_num_groups=0;
+       uint32 *rids=NULL, *new_rids=NULL, *tmp_rids=NULL;
+       struct samr_info *info = NULL;
+       int i,j;
+               
+       NTSTATUS ntstatus1;
+       NTSTATUS ntstatus2;
+
+       /* until i see a real useraliases query, we fack one up */
+
+       /* I have seen one, JFM 2/12/2001 */
+       /*
+        * Explanation of what this call does:
+        * for all the SID given in the request:
+        * return a list of alias (local groups)
+        * that have those SID as members.
+        *
+        * and that's the alias in the domain specified
+        * in the policy_handle
+        *
+        * if the policy handle is on an incorrect sid
+        * for example a user's sid
+        * we should reply NT_STATUS_OBJECT_TYPE_MISMATCH
+        */
        
-       num_rids = 1;
-       rid=(uint32 *)talloc_zero(p->mem_ctx, num_rids*sizeof(uint32));
-       if (rid==NULL)
-               return NT_STATUS_NO_MEMORY;
+       r_u->status = NT_STATUS_OK;
+
+       DEBUG(5,("_samr_query_useraliases: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
+               return NT_STATUS_INVALID_HANDLE;
+               
+       ntstatus1 = access_check_samr_function(info->acc_granted, SA_RIGHT_DOMAIN_LOOKUP_ALIAS_BY_MEM, "_samr_query_useraliases");
+       ntstatus2 = access_check_samr_function(info->acc_granted, SA_RIGHT_DOMAIN_OPEN_ACCOUNT, "_samr_query_useraliases");
        
-       /* until i see a real useraliases query, we fack one up */
+       if (!NT_STATUS_IS_OK(ntstatus1) || !NT_STATUS_IS_OK(ntstatus2)) {
+               if (!(NT_STATUS_EQUAL(ntstatus1,NT_STATUS_ACCESS_DENIED) && NT_STATUS_IS_OK(ntstatus2)) &&
+                   !(NT_STATUS_EQUAL(ntstatus1,NT_STATUS_ACCESS_DENIED) && NT_STATUS_IS_OK(ntstatus1))) {
+                       return (NT_STATUS_IS_OK(ntstatus1)) ? ntstatus2 : ntstatus1;
+               }
+       }               
 
-       rid[0] = BUILTIN_ALIAS_RID_USERS;
+       if (!sid_check_is_domain(&info->sid) &&
+           !sid_check_is_builtin(&info->sid))
+               return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-       init_samr_r_query_useraliases(r_u, num_rids, rid, NT_STATUS_OK);
 
-       return NT_STATUS_OK;
+       for (i=0; i<q_u->num_sids1; i++) {
+
+               r_u->status=get_alias_user_groups(p->mem_ctx, &info->sid, &tmp_num_groups, &tmp_rids, &(q_u->sid[i].sid));
+
+               /*
+                * if there is an error, we just continue as
+                * it can be an unfound user or group
+                */
+               if (!NT_STATUS_IS_OK(r_u->status)) {
+                       DEBUG(10,("_samr_query_useraliases: an error occured while getting groups\n"));
+                       continue;
+               }
 
+               if (tmp_num_groups==0) {
+                       DEBUG(10,("_samr_query_useraliases: no groups found\n"));
+                       continue;
+               }
+
+               new_rids=(uint32 *)talloc_realloc(p->mem_ctx, rids, (num_groups+tmp_num_groups)*sizeof(uint32));
+               if (new_rids==NULL) {
+                       DEBUG(0,("_samr_query_useraliases: could not realloc memory\n"));
+                       return NT_STATUS_NO_MEMORY;
+               }
+               rids=new_rids;
+
+               for (j=0; j<tmp_num_groups; j++)
+                       rids[j+num_groups]=tmp_rids[j];
+               
+               safe_free(tmp_rids);
+               
+               num_groups+=tmp_num_groups;
+       }
+       
+       init_samr_r_query_useraliases(r_u, num_groups, rids, NT_STATUS_OK);
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
@@ -2690,11 +3160,19 @@ NTSTATUS _samr_query_aliasmem(pipes_struct *p, SAMR_Q_QUERY_ALIASMEM *q_u, SAMR_
        fstring alias_sid_str;
        DOM_SID temp_sid;
 
+       SAM_ACCOUNT *sam_user = NULL;
+       BOOL check;
+       uint32 acc_granted;
 
        /* find the policy handle.  open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid)) 
+       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted)) 
                return NT_STATUS_INVALID_HANDLE;
-
+       
+       if (!NT_STATUS_IS_OK(r_u->status = 
+               access_check_samr_function(acc_granted, SA_RIGHT_ALIAS_GET_MEMBERS, "_samr_query_aliasmem"))) {
+               return r_u->status;
+       }
+               
        sid_copy(&als_sid, &alias_sid);
        sid_to_string(alias_sid_str, &alias_sid);
        sid_split_rid(&alias_sid, &alias_rid);
@@ -2703,12 +3181,12 @@ NTSTATUS _samr_query_aliasmem(pipes_struct *p, SAMR_Q_QUERY_ALIASMEM *q_u, SAMR_
 
        if (sid_equal(&alias_sid, &global_sid_Builtin)) {
                DEBUG(10, ("lookup on Builtin SID (S-1-5-32)\n"));
-               if(!get_builtin_group_from_sid(als_sid, &map))
+               if(!get_builtin_group_from_sid(als_sid, &map, MAPPING_WITHOUT_PRIV))
                        return NT_STATUS_NO_SUCH_ALIAS;
        } else {
-               if (sid_equal(&alias_sid, &global_sam_sid)) {
+               if (sid_equal(&alias_sid, get_global_sam_sid())) {
                        DEBUG(10, ("lookup on Server SID\n"));
-                       if(!get_local_group_from_sid(als_sid, &map))
+                       if(!get_local_group_from_sid(als_sid, &map, MAPPING_WITHOUT_PRIV))
                                return NT_STATUS_NO_SUCH_ALIAS;
                }
        }
@@ -2722,8 +3200,40 @@ NTSTATUS _samr_query_aliasmem(pipes_struct *p, SAMR_Q_QUERY_ALIASMEM *q_u, SAMR_
                return NT_STATUS_NO_MEMORY;
 
        for (i = 0; i < num_uids; i++) {
-               sid_copy(&temp_sid, &global_sam_sid);
-               sid_append_rid(&temp_sid, pdb_uid_to_user_rid(uid[i]));
+               struct passwd *pass;
+               uint32 rid;
+
+               sid_copy(&temp_sid, get_global_sam_sid());
+
+               pass = getpwuid_alloc(uid[i]);
+               if (!pass) continue;
+
+               if (!NT_STATUS_IS_OK(pdb_init_sam(&sam_user))) {
+                       passwd_free(&pass);
+                       continue;
+               }
+
+               become_root();
+               check = pdb_getsampwnam(sam_user, pass->pw_name);
+               unbecome_root();
+       
+               if (check != True) {
+                       pdb_free_sam(&sam_user);
+                       passwd_free(&pass);
+                       continue;
+               }
+       
+               rid = pdb_get_user_rid(sam_user);
+               if (rid == 0) {
+                       pdb_free_sam(&sam_user);
+                       passwd_free(&pass);
+                       continue;
+               }
+
+               pdb_free_sam(&sam_user);
+               passwd_free(&pass);
+
+               sid_append_rid(&temp_sid, rid);
                
                init_dom_sid2(&sid[i], &temp_sid);
        }
@@ -2752,11 +3262,18 @@ NTSTATUS _samr_query_groupmem(pipes_struct *p, SAMR_Q_QUERY_GROUPMEM *q_u, SAMR_
        uint32 *rid=NULL;
        uint32 *attr=NULL;
 
+       SAM_ACCOUNT *sam_user = NULL;
+       BOOL check;
+       uint32 acc_granted;
 
        /* find the policy handle.  open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, &q_u->group_pol, &group_sid)) 
+       if (!get_lsa_policy_samr_sid(p, &q_u->group_pol, &group_sid, &acc_granted)) 
                return NT_STATUS_INVALID_HANDLE;
-
+               
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_GROUP_GET_MEMBERS, "_samr_query_groupmem"))) {
+               return r_u->status;
+       }
+               
        /* todo: change to use sid_compare_front */
 
        sid_split_rid(&group_sid, &group_rid);
@@ -2764,13 +3281,13 @@ NTSTATUS _samr_query_groupmem(pipes_struct *p, SAMR_Q_QUERY_GROUPMEM *q_u, SAMR_
        DEBUG(10, ("sid is %s\n", group_sid_str));
 
        /* can we get a query for an SID outside our domain ? */
-       if (!sid_equal(&group_sid, &global_sam_sid))
+       if (!sid_equal(&group_sid, get_global_sam_sid()))
                return NT_STATUS_NO_SUCH_GROUP;
 
        sid_append_rid(&group_sid, group_rid);
        DEBUG(10, ("lookup on Domain SID\n"));
 
-       if(!get_domain_group_from_sid(group_sid, &map))
+       if(!get_domain_group_from_sid(group_sid, &map, MAPPING_WITHOUT_PRIV))
                return NT_STATUS_NO_SUCH_GROUP;
 
        if(!get_uid_list_of_group(map.gid, &uid, &num_uids))
@@ -2783,7 +3300,38 @@ NTSTATUS _samr_query_groupmem(pipes_struct *p, SAMR_Q_QUERY_GROUPMEM *q_u, SAMR_
                return NT_STATUS_NO_MEMORY;
        
        for (i=0; i<num_uids; i++) {
-               rid[i]=pdb_uid_to_user_rid(uid[i]);
+               struct passwd *pass;
+               uint32 urid;
+
+               pass = getpwuid_alloc(uid[i]);
+               if (!pass) continue;
+
+               if (!NT_STATUS_IS_OK(pdb_init_sam(&sam_user))) {
+                       passwd_free(&pass);
+                       continue;
+               }
+
+               become_root();
+               check = pdb_getsampwnam(sam_user, pass->pw_name);
+               unbecome_root();
+       
+               if (check != True) {
+                       pdb_free_sam(&sam_user);
+                       passwd_free(&pass);
+                       continue;
+               }
+       
+               urid = pdb_get_user_rid(sam_user);
+               if (urid == 0) {
+                       pdb_free_sam(&sam_user);
+                       passwd_free(&pass);
+                       continue;
+               }
+
+               pdb_free_sam(&sam_user);
+               passwd_free(&pass);
+
+               rid[i] = urid;
                attr[i] = SID_NAME_USER;                
        }
 
@@ -2804,46 +3352,74 @@ NTSTATUS _samr_add_aliasmem(pipes_struct *p, SAMR_Q_ADD_ALIASMEM *q_u, SAMR_R_AD
        struct passwd *pwd;
        struct group *grp;
        fstring grp_name;
-       uint32 rid;
        GROUP_MAP map;
+       NTSTATUS ret;
+       SAM_ACCOUNT *sam_user = NULL;
+       BOOL check;
+       uint32 acc_granted;
 
        /* Find the policy handle. Open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid)) 
+       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted)) 
                return NT_STATUS_INVALID_HANDLE;
-
+       
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_ALIAS_ADD_MEMBER, "_samr_add_aliasmem"))) {
+               return r_u->status;
+       }
+               
        sid_to_string(alias_sid_str, &alias_sid);
        DEBUG(10, ("sid is %s\n", alias_sid_str));
 
-       if (sid_compare(&alias_sid, &global_sam_sid)>0) {
+       if (sid_compare(&alias_sid, get_global_sam_sid())>0) {
                DEBUG(10, ("adding member on Server SID\n"));
-               if(!get_local_group_from_sid(alias_sid, &map))
+               if(!get_local_group_from_sid(alias_sid, &map, MAPPING_WITHOUT_PRIV))
                        return NT_STATUS_NO_SUCH_ALIAS;
        
        } else {
                if (sid_compare(&alias_sid, &global_sid_Builtin)>0) {
                        DEBUG(10, ("adding member on BUILTIN SID\n"));
-                       if( !get_builtin_group_from_sid(alias_sid, &map))
+                       if( !get_local_group_from_sid(alias_sid, &map, MAPPING_WITHOUT_PRIV))
                                return NT_STATUS_NO_SUCH_ALIAS;
 
                } else
                        return NT_STATUS_NO_SUCH_ALIAS;
        }
+
+       ret = pdb_init_sam(&sam_user);
+       if (!NT_STATUS_IS_OK(ret))
+               return ret;
+       
+       check = pdb_getsampwsid(sam_user, &q_u->sid.sid);
        
-       sid_split_rid(&q_u->sid.sid, &rid);
-       uid=pdb_user_rid_to_uid(rid);
+       if (check != True) {
+               pdb_free_sam(&sam_user);
+               return NT_STATUS_NO_SUCH_USER;
+       }
 
-       if ((pwd=getpwuid(uid)) == NULL)
+       /* check a real user exist before we run the script to add a user to a group */
+       if (NT_STATUS_IS_ERR(sid_to_uid(pdb_get_user_sid(sam_user), &uid))) {
+               pdb_free_sam(&sam_user);
                return NT_STATUS_NO_SUCH_USER;
+       }
 
-       if ((grp=getgrgid(map.gid)) == NULL)
+       pdb_free_sam(&sam_user);
+
+       if ((pwd=getpwuid_alloc(uid)) == NULL) {
+               return NT_STATUS_NO_SUCH_USER;
+       }
+       
+       if ((grp=getgrgid(map.gid)) == NULL) {
+               passwd_free(&pwd);
                return NT_STATUS_NO_SUCH_ALIAS;
+       }
 
        /* we need to copy the name otherwise it's overloaded in user_in_group_list */
        fstrcpy(grp_name, grp->gr_name);
 
        /* if the user is already in the group */
-       if(user_in_group_list(pwd->pw_name, grp_name))
+       if(user_in_unix_group_list(pwd->pw_name, grp_name)) {
+               passwd_free(&pwd);
                return NT_STATUS_MEMBER_IN_ALIAS;
+       }
 
        /* 
         * ok, the group exist, the user exist, the user is not in the group,
@@ -2852,9 +3428,12 @@ NTSTATUS _samr_add_aliasmem(pipes_struct *p, SAMR_Q_ADD_ALIASMEM *q_u, SAMR_R_AD
        smb_add_user_group(grp_name, pwd->pw_name);
 
        /* check if the user has been added then ... */
-       if(!user_in_group_list(pwd->pw_name, grp_name))
+       if(!user_in_unix_group_list(pwd->pw_name, grp_name)) {
+               passwd_free(&pwd);
                return NT_STATUS_MEMBER_NOT_IN_ALIAS;   /* don't know what to reply else */
+       }
 
+       passwd_free(&pwd);
        return NT_STATUS_OK;
 }
 
@@ -2864,8 +3443,64 @@ NTSTATUS _samr_add_aliasmem(pipes_struct *p, SAMR_Q_ADD_ALIASMEM *q_u, SAMR_R_AD
 
 NTSTATUS _samr_del_aliasmem(pipes_struct *p, SAMR_Q_DEL_ALIASMEM *q_u, SAMR_R_DEL_ALIASMEM *r_u)
 {
-       DEBUG(0,("_samr_del_aliasmem: Not yet implemented.\n"));
-       return NT_STATUS_NOT_IMPLEMENTED;
+       DOM_SID alias_sid;
+       fstring alias_sid_str;
+       struct group *grp;
+       fstring grp_name;
+       GROUP_MAP map;
+       SAM_ACCOUNT *sam_pass=NULL;
+       uint32 acc_granted;
+
+       /* Find the policy handle. Open a policy on it. */
+       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted)) 
+               return NT_STATUS_INVALID_HANDLE;
+       
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_ALIAS_REMOVE_MEMBER, "_samr_del_aliasmem"))) {
+               return r_u->status;
+       }
+       
+       sid_to_string(alias_sid_str, &alias_sid);
+       DEBUG(10, ("_samr_del_aliasmem:sid is %s\n", alias_sid_str));
+
+       if (!sid_check_is_in_our_domain(&alias_sid) &&
+           !sid_check_is_in_builtin(&alias_sid)) {
+               DEBUG(10, ("_samr_del_aliasmem:invalid alias group\n"));
+               return NT_STATUS_NO_SUCH_ALIAS;
+       }
+
+       if( !get_local_group_from_sid(alias_sid, &map, MAPPING_WITHOUT_PRIV))
+               return NT_STATUS_NO_SUCH_ALIAS;
+
+       if ((grp=getgrgid(map.gid)) == NULL)
+               return NT_STATUS_NO_SUCH_ALIAS;
+
+       /* we need to copy the name otherwise it's overloaded in user_in_unix_group_list */
+       fstrcpy(grp_name, grp->gr_name);
+
+       /* check if the user exists before trying to remove it from the group */
+       pdb_init_sam(&sam_pass);
+       if(!pdb_getsampwsid(sam_pass, &q_u->sid.sid)) {
+               DEBUG(5,("_samr_del_aliasmem:User %s doesn't exist.\n", pdb_get_username(sam_pass)));
+               pdb_free_sam(&sam_pass);
+               return NT_STATUS_NO_SUCH_USER;
+       }
+
+       /* if the user is not in the group */
+       if(!user_in_unix_group_list(pdb_get_username(sam_pass), grp_name)) {
+               pdb_free_sam(&sam_pass);
+               return NT_STATUS_MEMBER_IN_ALIAS;
+       }
+
+       smb_delete_user_group(grp_name, pdb_get_username(sam_pass));
+
+       /* check if the user has been removed then ... */
+       if(user_in_unix_group_list(pdb_get_username(sam_pass), grp_name)) {
+               pdb_free_sam(&sam_pass);
+               return NT_STATUS_MEMBER_NOT_IN_ALIAS;   /* don't know what to reply else */
+       }
+
+       pdb_free_sam(&sam_pass);
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
@@ -2875,39 +3510,64 @@ NTSTATUS _samr_del_aliasmem(pipes_struct *p, SAMR_Q_DEL_ALIASMEM *q_u, SAMR_R_DE
 NTSTATUS _samr_add_groupmem(pipes_struct *p, SAMR_Q_ADD_GROUPMEM *q_u, SAMR_R_ADD_GROUPMEM *r_u)
 {
        DOM_SID group_sid;
+       DOM_SID user_sid;
        fstring group_sid_str;
        struct passwd *pwd;
        struct group *grp;
        fstring grp_name;
        GROUP_MAP map;
+       uid_t uid;
+       NTSTATUS ret;
+       SAM_ACCOUNT *sam_user=NULL;
+       BOOL check;
+       uint32 acc_granted;
 
        /* Find the policy handle. Open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid)) 
+       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted)) 
                return NT_STATUS_INVALID_HANDLE;
+       
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_GROUP_ADD_MEMBER, "_samr_add_groupmem"))) {
+               return r_u->status;
+       }
 
        sid_to_string(group_sid_str, &group_sid);
        DEBUG(10, ("sid is %s\n", group_sid_str));
 
-       if (sid_compare(&group_sid, &global_sam_sid)<=0)
+       if (sid_compare(&group_sid, get_global_sam_sid())<=0)
                return NT_STATUS_NO_SUCH_GROUP;
 
        DEBUG(10, ("lookup on Domain SID\n"));
 
-       if(!get_domain_group_from_sid(group_sid, &map))
+       if(!get_domain_group_from_sid(group_sid, &map, MAPPING_WITHOUT_PRIV))
                return NT_STATUS_NO_SUCH_GROUP;
 
-       if ((pwd=getpwuid(pdb_user_rid_to_uid(q_u->rid))) ==NULL)
-               return NT_STATUS_NO_SUCH_USER;
+       sid_copy(&user_sid, get_global_sam_sid());
+       sid_append_rid(&user_sid, q_u->rid);
 
-       if ((grp=getgrgid(map.gid)) == NULL)
+       ret = pdb_init_sam(&sam_user);
+       if (!NT_STATUS_IS_OK(ret))
+               return ret;
+       
+       check = pdb_getsampwsid(sam_user, &user_sid);
+       
+       if (check != True) {
+               pdb_free_sam(&sam_user);
+               return NT_STATUS_NO_SUCH_USER;
+       }
+       
+       if ((grp=getgrgid(map.gid)) == NULL) {
+               passwd_free(&pwd);
                return NT_STATUS_NO_SUCH_GROUP;
+       }
 
-       /* we need to copy the name otherwise it's overloaded in user_in_group_list */
+       /* we need to copy the name otherwise it's overloaded in user_in_unix_group_list */
        fstrcpy(grp_name, grp->gr_name);
 
        /* if the user is already in the group */
-       if(user_in_group_list(pwd->pw_name, grp_name))
+       if(user_in_unix_group_list(pwd->pw_name, grp_name)) {
+               passwd_free(&pwd);
                return NT_STATUS_MEMBER_IN_GROUP;
+       }
 
        /* 
         * ok, the group exist, the user exist, the user is not in the group,
@@ -2918,9 +3578,12 @@ NTSTATUS _samr_add_groupmem(pipes_struct *p, SAMR_Q_ADD_GROUPMEM *q_u, SAMR_R_AD
        smb_add_user_group(grp_name, pwd->pw_name);
 
        /* check if the user has been added then ... */
-       if(!user_in_group_list(pwd->pw_name, grp_name))
+       if(!user_in_unix_group_list(pwd->pw_name, grp_name)) {
+               passwd_free(&pwd);
                return NT_STATUS_MEMBER_NOT_IN_GROUP;           /* don't know what to reply else */
+       }
 
+       passwd_free(&pwd);
        return NT_STATUS_OK;
 }
 
@@ -2930,8 +3593,86 @@ NTSTATUS _samr_add_groupmem(pipes_struct *p, SAMR_Q_ADD_GROUPMEM *q_u, SAMR_R_AD
 
 NTSTATUS _samr_del_groupmem(pipes_struct *p, SAMR_Q_DEL_GROUPMEM *q_u, SAMR_R_DEL_GROUPMEM *r_u)
 {
-       DEBUG(0,("_samr_del_groupmem: Not yet implemented.\n"));
-       return NT_STATUS_NOT_IMPLEMENTED;
+       DOM_SID group_sid;
+       DOM_SID user_sid;
+       SAM_ACCOUNT *sam_pass=NULL;
+       GROUP_MAP map;
+       fstring grp_name;
+       struct group *grp;
+       uint32 acc_granted;
+
+       /*
+        * delete the group member named q_u->rid
+        * who is a member of the sid associated with the handle
+        * the rid is a user's rid as the group is a domain group.
+        */
+
+       /* Find the policy handle. Open a policy on it. */
+       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted)) 
+               return NT_STATUS_INVALID_HANDLE;
+       
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_GROUP_REMOVE_MEMBER, "_samr_del_groupmem"))) {
+               return r_u->status;
+       }
+               
+       if (!sid_check_is_in_our_domain(&group_sid))
+               return NT_STATUS_NO_SUCH_GROUP;
+
+       sid_copy(&user_sid, get_global_sam_sid());
+       sid_append_rid(&user_sid, q_u->rid);
+
+       if (!get_domain_group_from_sid(group_sid, &map, MAPPING_WITHOUT_PRIV))
+               return NT_STATUS_NO_SUCH_GROUP;
+
+       if ((grp=getgrgid(map.gid)) == NULL)
+               return NT_STATUS_NO_SUCH_GROUP;
+
+       /* we need to copy the name otherwise it's overloaded in user_in_group_list */
+       fstrcpy(grp_name, grp->gr_name);
+
+       /* check if the user exists before trying to remove it from the group */
+       pdb_init_sam(&sam_pass);
+       if (!pdb_getsampwsid(sam_pass, &user_sid)) {
+               DEBUG(5,("User %s doesn't exist.\n", pdb_get_username(sam_pass)));
+               pdb_free_sam(&sam_pass);
+               return NT_STATUS_NO_SUCH_USER;
+       }
+
+       /* if the user is not in the group */
+       if (!user_in_unix_group_list(pdb_get_username(sam_pass), grp_name)) {
+               pdb_free_sam(&sam_pass);
+               return NT_STATUS_MEMBER_NOT_IN_GROUP;
+       }
+
+       smb_delete_user_group(grp_name, pdb_get_username(sam_pass));
+
+       /* check if the user has been removed then ... */
+       if (user_in_unix_group_list(pdb_get_username(sam_pass), grp_name)) {
+               pdb_free_sam(&sam_pass);
+               return NT_STATUS_ACCESS_DENIED;         /* don't know what to reply else */
+       }
+       
+       pdb_free_sam(&sam_pass);
+       return NT_STATUS_OK;
+
+}
+
+/****************************************************************************
+ Delete a UNIX user on demand.
+****************************************************************************/
+
+static int smb_delete_user(const char *unix_user)
+{
+       pstring del_script;
+       int ret;
+
+       pstrcpy(del_script, lp_deluser_script());
+       if (! *del_script)
+               return -1;
+       all_string_sub(del_script, "%u", unix_user, sizeof(pstring));
+       ret = smbrun(del_script,NULL);
+       DEBUG(3,("smb_delete_user: Running the command `%s' gave %d\n",del_script,ret));
+       return ret;
 }
 
 /*********************************************************************
@@ -2940,8 +3681,52 @@ NTSTATUS _samr_del_groupmem(pipes_struct *p, SAMR_Q_DEL_GROUPMEM *q_u, SAMR_R_DE
 
 NTSTATUS _samr_delete_dom_user(pipes_struct *p, SAMR_Q_DELETE_DOM_USER *q_u, SAMR_R_DELETE_DOM_USER *r_u )
 {
-       DEBUG(0,("_samr_delete_dom_user: Not yet implemented.\n"));
-       return NT_STATUS_NOT_IMPLEMENTED;
+       DOM_SID user_sid;
+       SAM_ACCOUNT *sam_pass=NULL;
+       uint32 acc_granted;
+
+       DEBUG(5, ("_samr_delete_dom_user: %d\n", __LINE__));
+
+       /* Find the policy handle. Open a policy on it. */
+       if (!get_lsa_policy_samr_sid(p, &q_u->user_pol, &user_sid, &acc_granted)) 
+               return NT_STATUS_INVALID_HANDLE;
+               
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, STD_RIGHT_DELETE_ACCESS, "_samr_delete_dom_user"))) {
+               return r_u->status;
+       }
+               
+       if (!sid_check_is_in_our_domain(&user_sid))
+               return NT_STATUS_CANNOT_DELETE;
+
+       /* check if the user exists before trying to delete */
+       pdb_init_sam(&sam_pass);
+       if(!pdb_getsampwsid(sam_pass, &user_sid)) {
+               DEBUG(5,("_samr_delete_dom_user:User %s doesn't exist.\n", pdb_get_username(sam_pass)));
+               pdb_free_sam(&sam_pass);
+               return NT_STATUS_NO_SUCH_USER;
+       }
+
+       /* delete the unix side */
+       /*
+        * note: we don't check if the delete really happened
+        * as the script is not necessary present
+        * and maybe the sysadmin doesn't want to delete the unix side
+        */
+       smb_delete_user(pdb_get_username(sam_pass));
+
+       /* and delete the samba side */
+       if (!pdb_delete_sam_account(sam_pass)) {
+               DEBUG(5,("_samr_delete_dom_user:Failed to delete entry for user %s.\n", pdb_get_username(sam_pass)));
+               pdb_free_sam(&sam_pass);
+               return NT_STATUS_CANNOT_DELETE;
+       }
+       
+       pdb_free_sam(&sam_pass);
+
+       if (!close_policy_hnd(p, &q_u->user_pol))
+               return NT_STATUS_OBJECT_NAME_INVALID;
+
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
@@ -2957,13 +3742,18 @@ NTSTATUS _samr_delete_dom_group(pipes_struct *p, SAMR_Q_DELETE_DOM_GROUP *q_u, S
        gid_t gid;
        struct group *grp;
        GROUP_MAP map;
+       uint32 acc_granted;
 
        DEBUG(5, ("samr_delete_dom_group: %d\n", __LINE__));
 
        /* Find the policy handle. Open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, &q_u->group_pol, &group_sid)) 
+       if (!get_lsa_policy_samr_sid(p, &q_u->group_pol, &group_sid, &acc_granted)) 
                return NT_STATUS_INVALID_HANDLE;
-
+               
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, STD_RIGHT_DELETE_ACCESS, "_samr_delete_dom_group"))) {
+               return r_u->status;
+       }
+               
        sid_copy(&dom_sid, &group_sid);
        sid_to_string(group_sid_str, &dom_sid);
        sid_split_rid(&dom_sid, &group_rid);
@@ -2971,13 +3761,13 @@ NTSTATUS _samr_delete_dom_group(pipes_struct *p, SAMR_Q_DELETE_DOM_GROUP *q_u, S
        DEBUG(10, ("sid is %s\n", group_sid_str));
 
        /* we check if it's our SID before deleting */
-       if (!sid_equal(&dom_sid, &global_sam_sid))
+       if (!sid_equal(&dom_sid, get_global_sam_sid()))
                return NT_STATUS_NO_SUCH_GROUP;
 
        DEBUG(10, ("lookup on Domain SID\n"));
 
-       if(!get_domain_group_from_sid(group_sid, &map))
-               return NT_STATUS_NO_SUCH_ALIAS;
+       if(!get_domain_group_from_sid(group_sid, &map, MAPPING_WITHOUT_PRIV))
+               return NT_STATUS_NO_SUCH_GROUP;
 
        gid=map.gid;
 
@@ -2992,7 +3782,7 @@ NTSTATUS _samr_delete_dom_group(pipes_struct *p, SAMR_Q_DELETE_DOM_GROUP *q_u, S
        if ( (grp=getgrgid(gid)) != NULL)
                return NT_STATUS_ACCESS_DENIED;
 
-       if(!group_map_remove(group_sid))
+       if(!pdb_delete_group_mapping_entry(group_sid))
                return NT_STATUS_ACCESS_DENIED;
 
        if (!close_policy_hnd(p, &q_u->group_pol))
@@ -3014,13 +3804,18 @@ NTSTATUS _samr_delete_dom_alias(pipes_struct *p, SAMR_Q_DELETE_DOM_ALIAS *q_u, S
        gid_t gid;
        struct group *grp;
        GROUP_MAP map;
+       uint32 acc_granted;
 
        DEBUG(5, ("_samr_delete_dom_alias: %d\n", __LINE__));
 
        /* Find the policy handle. Open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid)) 
+       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted)) 
                return NT_STATUS_INVALID_HANDLE;
-
+       
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, STD_RIGHT_DELETE_ACCESS, "_samr_delete_dom_alias"))) {
+               return r_u->status;
+       }
+               
        sid_copy(&dom_sid, &alias_sid);
        sid_to_string(alias_sid_str, &dom_sid);
        sid_split_rid(&dom_sid, &alias_rid);
@@ -3028,12 +3823,12 @@ NTSTATUS _samr_delete_dom_alias(pipes_struct *p, SAMR_Q_DELETE_DOM_ALIAS *q_u, S
        DEBUG(10, ("sid is %s\n", alias_sid_str));
 
        /* we check if it's our SID before deleting */
-       if (!sid_equal(&dom_sid, &global_sam_sid))
+       if (!sid_equal(&dom_sid, get_global_sam_sid()))
                return NT_STATUS_NO_SUCH_ALIAS;
 
        DEBUG(10, ("lookup on Local SID\n"));
 
-       if(!get_local_group_from_sid(alias_sid, &map))
+       if(!get_local_group_from_sid(alias_sid, &map, MAPPING_WITHOUT_PRIV))
                return NT_STATUS_NO_SUCH_ALIAS;
 
        gid=map.gid;
@@ -3050,7 +3845,7 @@ NTSTATUS _samr_delete_dom_alias(pipes_struct *p, SAMR_Q_DELETE_DOM_ALIAS *q_u, S
                return NT_STATUS_ACCESS_DENIED;
 
        /* don't check if we removed it as it could be an un-mapped group */
-       group_map_remove(alias_sid);
+       pdb_delete_group_mapping_entry(alias_sid);
 
        if (!close_policy_hnd(p, &q_u->alias_pol))
                return NT_STATUS_OBJECT_NAME_INVALID;
@@ -3070,12 +3865,21 @@ NTSTATUS _samr_create_dom_group(pipes_struct *p, SAMR_Q_CREATE_DOM_GROUP *q_u, S
        fstring sid_string;
        struct group *grp;
        struct samr_info *info;
+       PRIVILEGE_SET priv_set;
+       uint32 acc_granted;
+       gid_t gid;
+
+       init_privilege(&priv_set);
 
        /* Find the policy handle. Open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &dom_sid)) 
+       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &dom_sid, &acc_granted)) 
                return NT_STATUS_INVALID_HANDLE;
-
-       if (!sid_equal(&dom_sid, &global_sam_sid))
+       
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_DOMAIN_CREATE_GROUP, "_samr_create_dom_group"))) {
+               return r_u->status;
+       }
+               
+       if (!sid_equal(&dom_sid, get_global_sam_sid()))
                return NT_STATUS_ACCESS_DENIED;
 
        /* TODO: check if allowed to create group and add a become_root/unbecome_root pair.*/
@@ -3087,27 +3891,26 @@ NTSTATUS _samr_create_dom_group(pipes_struct *p, SAMR_Q_CREATE_DOM_GROUP *q_u, S
                return NT_STATUS_GROUP_EXISTS;
 
        /* we can create the UNIX group */
-       smb_create_group(name);
+       if (smb_create_group(name, &gid) != 0)
+               return NT_STATUS_ACCESS_DENIED;
 
        /* check if the group has been successfully created */
-       if ((grp=getgrnam(name)) == NULL)
+       if ((grp=getgrgid(gid)) == NULL)
                return NT_STATUS_ACCESS_DENIED;
 
        r_u->rid=pdb_gid_to_group_rid(grp->gr_gid);
 
        /* add the group to the mapping table */
-       if(!add_initial_entry(grp->gr_gid, sid_string, SID_NAME_DOM_GRP, name, NULL, SE_PRIV_NONE))
+       sid_copy(&info_sid, get_global_sam_sid());
+       sid_append_rid(&info_sid, r_u->rid);
+       sid_to_string(sid_string, &info_sid);
+
+       if(!add_initial_entry(grp->gr_gid, sid_string, SID_NAME_DOM_GRP, name, NULL, priv_set, PR_ACCESS_FROM_NETWORK))
                return NT_STATUS_ACCESS_DENIED;
 
-       if ((info = (struct samr_info *)malloc(sizeof(struct samr_info))) == NULL)
+       if ((info = get_samr_info_by_sid(&info_sid)) == NULL)
                return NT_STATUS_NO_MEMORY;
 
-       ZERO_STRUCTP(info);
-
-       sid_copy(&info_sid, &global_sam_sid);
-       sid_append_rid(&info->sid, r_u->rid);
-       sid_to_string(sid_string, &info->sid);
-
        /* get a (unique) handle.  open a policy on it. */
        if (!create_policy_hnd(p, &r_u->pol, free_samr_info, (void *)info))
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
@@ -3122,16 +3925,26 @@ NTSTATUS _samr_create_dom_group(pipes_struct *p, SAMR_Q_CREATE_DOM_GROUP *q_u, S
 NTSTATUS _samr_create_dom_alias(pipes_struct *p, SAMR_Q_CREATE_DOM_ALIAS *q_u, SAMR_R_CREATE_DOM_ALIAS *r_u)
 {
        DOM_SID dom_sid;
+       DOM_SID info_sid;
        fstring name;
        fstring sid_string;
        struct group *grp;
        struct samr_info *info;
+       PRIVILEGE_SET priv_set;
+       uint32 acc_granted;
+       gid_t gid;
+
+       init_privilege(&priv_set);
 
        /* Find the policy handle. Open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, &q_u->dom_pol, &dom_sid)) 
+       if (!get_lsa_policy_samr_sid(p, &q_u->dom_pol, &dom_sid, &acc_granted)) 
                return NT_STATUS_INVALID_HANDLE;
-
-       if (!sid_equal(&dom_sid, &global_sam_sid))
+               
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_DOMAIN_CREATE_ALIAS, "_samr_create_alias"))) {
+               return r_u->status;
+       }
+               
+       if (!sid_equal(&dom_sid, get_global_sam_sid()))
                return NT_STATUS_ACCESS_DENIED;
 
        /* TODO: check if allowed to create group  and add a become_root/unbecome_root pair.*/
@@ -3143,27 +3956,26 @@ NTSTATUS _samr_create_dom_alias(pipes_struct *p, SAMR_Q_CREATE_DOM_ALIAS *q_u, S
                return NT_STATUS_GROUP_EXISTS;
 
        /* we can create the UNIX group */
-       smb_create_group(name);
+       if (smb_create_group(name, &gid) != 0)
+               return NT_STATUS_ACCESS_DENIED;
 
        /* check if the group has been successfully created */
-       if ((grp=getgrnam(name)) == NULL)
+       if ((grp=getgrgid(gid)) == NULL)
                return NT_STATUS_ACCESS_DENIED;
 
        r_u->rid=pdb_gid_to_group_rid(grp->gr_gid);
 
-       if ((info = (struct samr_info *)malloc(sizeof(struct samr_info))) == NULL)
-               return NT_STATUS_NO_MEMORY;
-
-       ZERO_STRUCTP(info);
-
-       sid_copy(&info->sid, &global_sam_sid);
-       sid_append_rid(&info->sid, r_u->rid);
-       sid_to_string(sid_string, &info->sid);
+       sid_copy(&info_sid, get_global_sam_sid());
+       sid_append_rid(&info_sid, r_u->rid);
+       sid_to_string(sid_string, &info_sid);
 
        /* add the group to the mapping table */
-       if(!add_initial_entry(grp->gr_gid, sid_string, SID_NAME_ALIAS, name, NULL, SE_PRIV_NONE))
+       if(!add_initial_entry(grp->gr_gid, sid_string, SID_NAME_ALIAS, name, NULL, priv_set, PR_ACCESS_FROM_NETWORK))
                return NT_STATUS_ACCESS_DENIED;
 
+       if ((info = get_samr_info_by_sid(&info_sid)) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
        /* get a (unique) handle.  open a policy on it. */
        if (!create_policy_hnd(p, &r_u->alias_pol, free_samr_info, (void *)info))
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
@@ -3185,13 +3997,18 @@ NTSTATUS _samr_query_groupinfo(pipes_struct *p, SAMR_Q_QUERY_GROUPINFO *q_u, SAM
        uid_t *uid=NULL;
        int num_uids=0;
        GROUP_INFO_CTR *ctr;
+       uint32 acc_granted;
 
-       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid)) 
-               return NT_STATUS_INVALID_HANDLE;
-
-       if (!get_domain_group_from_sid(group_sid, &map))
+       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted)) 
                return NT_STATUS_INVALID_HANDLE;
        
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_GROUP_LOOKUP_INFO, "_samr_query_groupinfo"))) {
+               return r_u->status;
+       }
+               
+       if (!get_domain_group_from_sid(group_sid, &map, MAPPING_WITHOUT_PRIV))
+               return NT_STATUS_INVALID_HANDLE;
+
        ctr=(GROUP_INFO_CTR *)talloc_zero(p->mem_ctx, sizeof(GROUP_INFO_CTR));
        if (ctr==NULL)
                return NT_STATUS_NO_MEMORY;
@@ -3204,6 +4021,10 @@ NTSTATUS _samr_query_groupinfo(pipes_struct *p, SAMR_Q_QUERY_GROUPINFO *q_u, SAM
                        init_samr_group_info1(&ctr->group.info1, map.nt_name, map.comment, num_uids);
                        SAFE_FREE(uid);
                        break;
+               case 3:
+                       ctr->switch_value1 = 3;
+                       init_samr_group_info3(&ctr->group.info3);
+                       break;
                case 4:
                        ctr->switch_value1 = 4;
                        init_samr_group_info4(&ctr->group.info4, map.comment);
@@ -3228,11 +4049,16 @@ NTSTATUS _samr_set_groupinfo(pipes_struct *p, SAMR_Q_SET_GROUPINFO *q_u, SAMR_R_
        DOM_SID group_sid;
        GROUP_MAP map;
        GROUP_INFO_CTR *ctr;
+       uint32 acc_granted;
 
-       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid)) 
+       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
-
-       if (!get_domain_group_from_sid(group_sid, &map))
+       
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_GROUP_SET_INFO, "_samr_set_groupinfo"))) {
+               return r_u->status;
+       }
+               
+       if (!get_domain_group_from_sid(group_sid, &map, MAPPING_WITH_PRIV))
                return NT_STATUS_NO_SUCH_GROUP;
        
        ctr=q_u->ctr;
@@ -3245,19 +4071,24 @@ NTSTATUS _samr_set_groupinfo(pipes_struct *p, SAMR_Q_SET_GROUPINFO *q_u, SAMR_R_
                        unistr2_to_ascii(map.comment, &(ctr->group.info4.uni_acct_desc), sizeof(map.comment)-1);
                        break;
                default:
+                       free_privilege(&map.priv_set);
                        return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-       if(!add_mapping_entry(&map, TDB_REPLACE))
+       if(!pdb_update_group_mapping_entry(&map)) {
+               free_privilege(&map.priv_set);
                return NT_STATUS_NO_SUCH_GROUP;
+       }
+
+       free_privilege(&map.priv_set);
 
        return NT_STATUS_OK;
 }
 
 /*********************************************************************
- _samr_set_groupinfo
+ _samr_set_aliasinfo
  
- update a domain group's comment.
+ update an alias's comment.
 *********************************************************************/
 
 NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_SET_ALIASINFO *r_u)
@@ -3265,11 +4096,16 @@ NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_
        DOM_SID group_sid;
        GROUP_MAP map;
        ALIAS_INFO_CTR *ctr;
+       uint32 acc_granted;
 
-       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &group_sid)) 
+       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &group_sid, &acc_granted))
                return NT_STATUS_INVALID_HANDLE;
-
-       if (!get_local_group_from_sid(group_sid, &map))
+       
+       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_ALIAS_SET_INFO, "_samr_set_aliasinfo"))) {
+               return r_u->status;
+       }
+               
+       if (!get_local_group_from_sid(group_sid, &map, MAPPING_WITH_PRIV))
                return NT_STATUS_NO_SUCH_GROUP;
        
        ctr=&q_u->ctr;
@@ -3279,11 +4115,16 @@ NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_
                        unistr2_to_ascii(map.comment, &(ctr->alias.info3.uni_acct_desc), sizeof(map.comment)-1);
                        break;
                default:
+                       free_privilege(&map.priv_set);
                        return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-       if(!add_mapping_entry(&map, TDB_REPLACE))
+       if(!pdb_update_group_mapping_entry(&map)) {
+               free_privilege(&map.priv_set);
                return NT_STATUS_NO_SUCH_GROUP;
+       }
+
+       free_privilege(&map.priv_set);
 
        return NT_STATUS_OK;
 }
@@ -3294,7 +4135,18 @@ NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_
 
 NTSTATUS _samr_get_dom_pwinfo(pipes_struct *p, SAMR_Q_GET_DOM_PWINFO *q_u, SAMR_R_GET_DOM_PWINFO *r_u)
 {
+       /* Perform access check.  Since this rpc does not require a
+          policy handle it will not be caught by the access checks on
+          SAMR_CONNECT or SAMR_CONNECT_ANON. */
+
+       if (!pipe_access_check(p)) {
+               DEBUG(3, ("access denied to samr_get_dom_pwinfo\n"));
+               r_u->status = NT_STATUS_ACCESS_DENIED;
+               return r_u->status;
+       }
+
        /* Actually, returning zeros here works quite well :-). */
+
        return NT_STATUS_OK;
 }
 
@@ -3305,31 +4157,51 @@ NTSTATUS _samr_get_dom_pwinfo(pipes_struct *p, SAMR_Q_GET_DOM_PWINFO *q_u, SAMR_
 NTSTATUS _samr_open_group(pipes_struct *p, SAMR_Q_OPEN_GROUP *q_u, SAMR_R_OPEN_GROUP *r_u)
 {
        DOM_SID sid;
+       DOM_SID info_sid;
        GROUP_MAP map;
        struct samr_info *info;
+       SEC_DESC         *psd = NULL;
+       uint32            acc_granted;
+       uint32            des_access;
+       size_t            sd_size;
+       NTSTATUS          status;
        fstring sid_string;
 
-       if (!get_lsa_policy_samr_sid(p, &q_u->domain_pol, &sid)) 
+       if (!get_lsa_policy_samr_sid(p, &q_u->domain_pol, &sid, &acc_granted)) 
                return NT_STATUS_INVALID_HANDLE;
+       
+       if (!NT_STATUS_IS_OK(status = access_check_samr_function(acc_granted, SA_RIGHT_DOMAIN_OPEN_ACCOUNT, "_samr_open_group"))) {
+               return status;
+       }
+               
+       /*check if access can be granted as requested by client. */
+       samr_make_grp_obj_sd(p->mem_ctx, &psd, &sd_size);
+       se_map_generic(&des_access,&grp_generic_mapping);
+       if (!NT_STATUS_IS_OK(status = 
+                            access_check_samr_object(psd, p->pipe_user.nt_user_token, 
+                                                     des_access, &acc_granted, "_samr_open_group"))) {
+               return status;
+       }
+
 
        /* this should not be hard-coded like this */
-       if (!sid_equal(&sid, &global_sam_sid))
+       if (!sid_equal(&sid, get_global_sam_sid()))
                return NT_STATUS_ACCESS_DENIED;
 
-       if ((info = (struct samr_info *)malloc(sizeof(struct samr_info))) == NULL)
-               return NT_STATUS_NO_MEMORY;
-
-       ZERO_STRUCTP(info);
+       sid_copy(&info_sid, get_global_sam_sid());
+       sid_append_rid(&info_sid, q_u->rid_group);
+       sid_to_string(sid_string, &info_sid);
 
-       sid_copy(&info->sid, &global_sam_sid);
-       sid_append_rid(&info->sid, q_u->rid_group);
-       sid_to_string(sid_string, &info->sid);
+       if ((info = get_samr_info_by_sid(&info_sid)) == NULL)
+               return NT_STATUS_NO_MEMORY;
+               
+       info->acc_granted = acc_granted;
 
-       DEBUG(10, ("Opening SID: %s\n", sid_string));
+       DEBUG(10, ("_samr_open_group:Opening SID: %s\n", sid_string));
 
        /* check if that group really exists */
-       if (!get_domain_group_from_sid(info->sid, &map))
-               return NT_STATUS_NO_SUCH_USER;
+       if (!get_domain_group_from_sid(info->sid, &map, MAPPING_WITHOUT_PRIV))
+               return NT_STATUS_NO_SUCH_GROUP;
 
        /* get a (unique) handle.  open a policy on it. */
        if (!create_policy_hnd(p, &r_u->pol, free_samr_info, (void *)info))
@@ -3347,3 +4219,191 @@ NTSTATUS _samr_unknown_2d(pipes_struct *p, SAMR_Q_UNKNOWN_2D *q_u, SAMR_R_UNKNOW
        DEBUG(0,("_samr_unknown_2d: Not yet implemented.\n"));
        return NT_STATUS_NOT_IMPLEMENTED;
 }
+
+/*******************************************************************
+ _samr_unknown_2e
+ ********************************************************************/
+
+NTSTATUS _samr_unknown_2e(pipes_struct *p, SAMR_Q_UNKNOWN_2E *q_u, SAMR_R_UNKNOWN_2E *r_u)
+{
+       struct samr_info *info = NULL;
+       SAM_UNK_CTR *ctr;
+       uint32 min_pass_len,pass_hist,flag;
+       time_t u_expire, u_min_age;
+       NTTIME nt_expire, nt_min_age;
+
+       time_t u_lock_duration, u_reset_time;
+       NTTIME nt_lock_duration, nt_reset_time;
+       uint32 lockout;
+       
+       time_t u_logout;
+       NTTIME nt_logout;
+
+       uint32 num_users=0, num_groups=0, num_aliases=0;
+
+       uint32 account_policy_temp;
+
+       if ((ctr = (SAM_UNK_CTR *)talloc_zero(p->mem_ctx, sizeof(SAM_UNK_CTR))) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       ZERO_STRUCTP(ctr);
+
+       r_u->status = NT_STATUS_OK;
+
+       DEBUG(5,("_samr_unknown_2e: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (!find_policy_by_hnd(p, &q_u->domain_pol, (void **)&info))
+               return NT_STATUS_INVALID_HANDLE;
+
+       switch (q_u->switch_value) {
+               case 0x01:
+                       account_policy_get(AP_MIN_PASSWORD_LEN, &account_policy_temp);
+                       min_pass_len = account_policy_temp;
+
+                       account_policy_get(AP_PASSWORD_HISTORY, &account_policy_temp);
+                       pass_hist = account_policy_temp;
+
+                       account_policy_get(AP_USER_MUST_LOGON_TO_CHG_PASS, &account_policy_temp);
+                       flag = account_policy_temp;
+
+                       account_policy_get(AP_MAX_PASSWORD_AGE, &account_policy_temp);
+                       u_expire = account_policy_temp;
+
+                       account_policy_get(AP_MIN_PASSWORD_AGE, &account_policy_temp);
+                       u_min_age = account_policy_temp;
+
+                       unix_to_nt_time_abs(&nt_expire, u_expire);
+                       unix_to_nt_time_abs(&nt_min_age, u_min_age);
+
+                       init_unk_info1(&ctr->info.inf1, (uint16)min_pass_len, (uint16)pass_hist, 
+                                      flag, nt_expire, nt_min_age);
+                       break;
+               case 0x02:
+                       become_root();          
+                       r_u->status=load_sampwd_entries(info, ACB_NORMAL, False);
+                       unbecome_root();
+                       if (!NT_STATUS_IS_OK(r_u->status)) {
+                               DEBUG(5, ("_samr_unknown_2e: load_sampwd_entries failed\n"));
+                               return r_u->status;
+                       }
+                       num_users=info->disp_info.num_user_account;
+                       free_samr_db(info);
+                       
+                       r_u->status=load_group_domain_entries(info, get_global_sam_sid());
+                       if (NT_STATUS_IS_ERR(r_u->status)) {
+                               DEBUG(5, ("_samr_unknown_2e: load_group_domain_entries failed\n"));
+                               return r_u->status;
+                       }
+                       num_groups=info->disp_info.num_group_account;
+                       free_samr_db(info);
+
+                       /* The time call below is to get a sequence number for the sam. FIXME !!! JRA. */
+                       init_unk_info2(&ctr->info.inf2, lp_workgroup(), global_myname(), (uint32) time(NULL), 
+                                      num_users, num_groups, num_aliases);
+                       break;
+               case 0x03:
+                       account_policy_get(AP_TIME_TO_LOGOUT, &account_policy_temp);
+                       u_logout = account_policy_temp;
+
+                       unix_to_nt_time_abs(&nt_logout, u_logout);
+                       
+                       init_unk_info3(&ctr->info.inf3, nt_logout);
+                       break;
+               case 0x05:
+                       init_unk_info5(&ctr->info.inf5, global_myname());
+                       break;
+               case 0x06:
+                       init_unk_info6(&ctr->info.inf6);
+                       break;
+               case 0x07:
+                       init_unk_info7(&ctr->info.inf7);
+                       break;
+               case 0x0c:
+                       account_policy_get(AP_LOCK_ACCOUNT_DURATION, &account_policy_temp);
+                       u_lock_duration = account_policy_temp;
+
+                       account_policy_get(AP_RESET_COUNT_TIME, &account_policy_temp);
+                       u_reset_time = account_policy_temp;
+
+                       account_policy_get(AP_BAD_ATTEMPT_LOCKOUT, &account_policy_temp);
+                       lockout = account_policy_temp;
+       
+                       unix_to_nt_time_abs(&nt_lock_duration, u_lock_duration);
+                       unix_to_nt_time_abs(&nt_reset_time, u_reset_time);
+       
+                       init_unk_info12(&ctr->info.inf12, nt_lock_duration, nt_reset_time, (uint16)lockout);
+                       break;
+               default:
+                       return NT_STATUS_INVALID_INFO_CLASS;
+       }
+
+       init_samr_r_samr_unknown_2e(r_u, q_u->switch_value, ctr, NT_STATUS_OK);
+
+       DEBUG(5,("_samr_unknown_2e: %d\n", __LINE__));
+
+       return r_u->status;
+}
+
+/*******************************************************************
+ _samr_
+ ********************************************************************/
+
+NTSTATUS _samr_set_dom_info(pipes_struct *p, SAMR_Q_SET_DOMAIN_INFO *q_u, SAMR_R_SET_DOMAIN_INFO *r_u)
+{
+       time_t u_expire, u_min_age;
+       time_t u_logout;
+       time_t u_lock_duration, u_reset_time;
+
+       r_u->status = NT_STATUS_OK;
+
+       DEBUG(5,("_samr_set_dom_info: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (!find_policy_by_hnd(p, &q_u->domain_pol, NULL))
+               return NT_STATUS_INVALID_HANDLE;
+
+       DEBUG(5,("_samr_set_dom_info: switch_value: %d\n", q_u->switch_value));
+
+       switch (q_u->switch_value) {
+               case 0x01:
+                       u_expire=nt_time_to_unix_abs(&q_u->ctr->info.inf1.expire);
+                       u_min_age=nt_time_to_unix_abs(&q_u->ctr->info.inf1.min_passwordage);
+                       
+                       account_policy_set(AP_MIN_PASSWORD_LEN, (uint32)q_u->ctr->info.inf1.min_length_password);
+                       account_policy_set(AP_PASSWORD_HISTORY, (uint32)q_u->ctr->info.inf1.password_history);
+                       account_policy_set(AP_USER_MUST_LOGON_TO_CHG_PASS, (uint32)q_u->ctr->info.inf1.flag);
+                       account_policy_set(AP_MAX_PASSWORD_AGE, (int)u_expire);
+                       account_policy_set(AP_MIN_PASSWORD_AGE, (int)u_min_age);
+                       break;
+               case 0x02:
+                       break;
+               case 0x03:
+                       u_logout=nt_time_to_unix_abs(&q_u->ctr->info.inf3.logout);
+                       account_policy_set(AP_TIME_TO_LOGOUT, (int)u_logout);
+                       break;
+               case 0x05:
+                       break;
+               case 0x06:
+                       break;
+               case 0x07:
+                       break;
+               case 0x0c:
+                       u_lock_duration=nt_time_to_unix_abs(&q_u->ctr->info.inf12.duration);
+                       u_reset_time=nt_time_to_unix_abs(&q_u->ctr->info.inf12.reset_count);
+                       
+                       account_policy_set(AP_LOCK_ACCOUNT_DURATION, (int)u_lock_duration);
+                       account_policy_set(AP_RESET_COUNT_TIME, (int)u_reset_time);
+                       account_policy_set(AP_BAD_ATTEMPT_LOCKOUT, (uint32)q_u->ctr->info.inf12.bad_attempt_lockout);
+                       break;
+               default:
+                       return NT_STATUS_INVALID_INFO_CLASS;
+       }
+
+       init_samr_r_set_domain_info(r_u, NT_STATUS_OK);
+
+       DEBUG(5,("_samr_set_dom_info: %d\n", __LINE__));
+
+       return r_u->status;
+}
+