This is another *BIG* change...
[tprouty/samba.git] / source3 / rpc_server / srv_samr_nt.c
index dbed5227b0837e478ff9a5e745d1a88aae075af7..d079403455d8a4260514ce05407cecbce2babdbb 100644 (file)
@@ -5,8 +5,9 @@
  *  Copyright (C) Andrew Tridgell              1992-1997,
  *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
  *  Copyright (C) Paul Ashton                       1997.
- *  Copyright (C) Hewlett-Packard Company           1999.
- *  Copyright (C) Jeremy Allison                    2001.
+ *  Copyright (C) Marc Jacobsen                            1999.
+ *  Copyright (C) Jeremy Allison               2001-2002.
+ *  Copyright (C) Jean François Micouleau      1998-2001.
  *
  *  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 int DEBUGLEVEL;
-
 extern fstring global_myworkgroup;
 extern pstring global_myname;
 extern DOM_SID global_sam_sid;
+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 */
+       DISP_INFO disp_info;
 };
 
+/*******************************************************************
+ Create a samr_info struct.
+********************************************************************/
+
+static struct samr_info *get_samr_info_by_sid(DOM_SID *psid)
+{
+       struct samr_info *info;
+       fstring sid_str;
+
+       if ((info = (struct samr_info *)malloc(sizeof(struct samr_info))) == NULL)
+               return NULL;
+
+       ZERO_STRUCTP(info);
+       if (psid) {
+               DEBUG(10,("get_samr_info_by_sid: created new info for sid %s\n", sid_to_string(sid_str, psid) ));
+               sid_copy( &info->sid, psid);
+       } else {
+               DEBUG(10,("get_samr_info_by_sid: created new info for NULL sid.\n"));
+       }
+       return info;
+}
+
 /*******************************************************************
  Function to free the per handle data.
  ********************************************************************/
+static void free_samr_db(struct samr_info *info)
+{
+       int i;
+
+       if (info->disp_info.group_dbloaded) {
+               for (i=0; i<info->disp_info.num_group_account; i++)
+                       SAFE_FREE(info->disp_info.disp_group_info[i].grp);
+
+               SAFE_FREE(info->disp_info.disp_group_info);
+       }
+
+       if (info->disp_info.user_dbloaded){
+               for (i=0; i<info->disp_info.num_user_account; i++)
+                       pdb_free_sam(&info->disp_info.disp_user_info[i].sam);
+
+               SAFE_FREE(info->disp_info.disp_user_info);
+       }
+
+       info->disp_info.user_dbloaded=False;
+       info->disp_info.group_dbloaded=False;
+       info->disp_info.num_group_account=0;
+       info->disp_info.num_user_account=0;
+}
+
 
 static void free_samr_info(void *ptr)
 {
-       struct samr_info *samr = (struct samr_info *)ptr;
+       struct samr_info *info=(struct samr_info *) ptr;
 
-       safe_free(samr);
+       free_samr_db(info);
+       SAFE_FREE(info);
 }
 
 /*******************************************************************
@@ -73,396 +131,212 @@ static void samr_clear_passwd_fields( SAM_USER_INFO_21 *pass, int num_entries)
        }
 }
 
-static void samr_clear_sam_passwd( SAM_ACCOUNT *sam_pass)
+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);
-}
-
-/*******************************************************************
-  This next function should be replaced with something that
-  dynamically returns the correct user info..... JRA.
- ********************************************************************/
-
-static BOOL 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)
-{
-    SAM_ACCOUNT *pwd = NULL;
-
-    (*num_entries) = 0;
-    (*total_entries) = 0;
-
-    if (pw_buf == NULL)
-        return False;
-
-       if (!pdb_setsampwent(False)) {
-        DEBUG(0, ("get_sampwd_entries: Unable to open passdb.\n"));
-        return False;
-    }
-
-    while (((pwd = pdb_getsampwent()) != NULL) && (*num_entries) < max_num_entries) {
-        int user_name_len;
-
-        if (start_idx > 0) {
-            /* 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));
+       /* These now zero out the old password */
 
-        (*total_entries)++;
-    }
-
-    pdb_endsampwent();
-
-    return (*num_entries) > 0;
+       pdb_set_lanman_passwd(sam_pass, NULL);
+       pdb_set_nt_passwd(sam_pass, NULL);
 }
 
-static BOOL 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)
+
+static NTSTATUS load_sampwd_entries(struct samr_info *info, uint16 acb_mask)
 {
-    SAM_ACCOUNT *pwd = NULL;
+       SAM_ACCOUNT *pwd = NULL;
+       DISP_USER_INFO *pwd_array = NULL;
 
-       *num_entries = 0;
-       *total_entries = 0;
+       DEBUG(10,("load_sampwd_entries\n"));
 
-       if (pw_buf == NULL)
-               return False;
+       /* if the snapshoot is already loaded, return */
+       if (info->disp_info.user_dbloaded==True) {
+               DEBUG(10,("load_sampwd_entries: already in memory\n"));
+               return NT_STATUS_OK;
+       }
 
        if (!pdb_setsampwent(False)) {
-        DEBUG(0, ("jf_get_sampwd_entries: Unable to open passdb.\n"));
-        return False;
-    }
-
-       while (((pwd = pdb_getsampwent()) != NULL) && (*num_entries) < max_num_entries) {
-               int user_name_len;
-               int full_name_len;
-
-               if (acb_mask != 0 && !(pdb_get_acct_ctrl(pwd) & acb_mask))
-                       continue;
+               DEBUG(0, ("load_sampwd_entries: Unable to open passdb.\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-               if (start_idx > 0) {
-                       /* skip the requested number of entries.
-                          not very efficient, but hey...
-                       */
-                       start_idx--;
+       for (pdb_init_sam(&pwd); pdb_getsampwent(pwd) == True; pwd=NULL, pdb_init_sam(&pwd) ) {
+               
+               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;
                }
 
-               ZERO_STRUCTP(&pw_buf[(*num_entries)]);
+               /* 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 *)Realloc(info->disp_info.disp_user_info, 
+                                         (info->disp_info.num_user_account+MAX_SAM_ENTRIES)*sizeof(DISP_USER_INFO));
 
-               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);
+                       if (pwd_array==NULL)
+                               return NT_STATUS_NO_MEMORY;
 
-               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);
+                       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;
 
-               pw_buf[(*num_entries)].user_rid = pdb_get_user_rid(pwd);
-               memset((char *)pw_buf[(*num_entries)].nt_pwd, '\0', 16);
+               DEBUG(10,("load_sampwd_entries: entry: %d\n", info->disp_info.num_user_account));
 
-               /* 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);
+               info->disp_info.num_user_account++;     
+       }
 
-               pw_buf[(*num_entries)].acb_info = pdb_get_acct_ctrl(pwd);
+       pdb_endsampwent();
 
-               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) ));
-               (*num_entries)++;
-       }
+       /* the snapshoot is in memory, we're ready to enumerate fast */
 
-    pdb_endsampwent();
+       info->disp_info.user_dbloaded=True;
 
-       *total_entries = *num_entries;
-       return True;
-}
+       DEBUG(12,("load_sampwd_entries: done\n"));
 
-/*******************************************************************
- 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.
-********************************************************************/
+       return NT_STATUS_OK;
+}
 
-static char *unmap_unixname(char *unix_user_name, int name_idx)
+static NTSTATUS load_group_domain_entries(struct samr_info *info, DOM_SID *sid)
 {
-       char *mapfile = lp_username_map();
-       char **lines;
-       static pstring tok;
-       int i;
+       GROUP_MAP *map=NULL;
+       DISP_GROUP_INFO *grp_array = NULL;
+       uint32 group_entries = 0;
+       uint32 i;
 
-       if (!*unix_user_name) return NULL;
-       if (!*mapfile) return NULL;
+       DEBUG(10,("load_group_domain_entries\n"));
 
-       lines = file_lines_load(mapfile, NULL,False);
-       if (!lines) {
-               DEBUG(0,("unmap_unixname: can't open username map %s\n", mapfile));
-               return NULL;
+       /* 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;
        }
 
-       DEBUG(5,("unmap_unixname: scanning username map %s, index: %d\n", mapfile, name_idx));
+       enum_group_mapping(SID_NAME_DOM_GRP, &map, (int *)&group_entries, ENUM_ONLY_MAPPED, MAPPING_WITHOUT_PRIV);
 
-       for (i=0; lines[i]; i++) {
-               char *unixname = lines[i];
-               char *dosname = strchr(unixname,'=');
+       info->disp_info.num_group_account=group_entries;
 
-               if (!dosname)
-                       continue;
+       grp_array=(DISP_GROUP_INFO *)malloc(info->disp_info.num_group_account*sizeof(DISP_GROUP_INFO));
 
-               *dosname++ = 0;
+       if (group_entries!=0 && grp_array==NULL) {
+               SAFE_FREE(map);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-               while (isspace(*unixname))
-                       unixname++;
-               if ('!' == *unixname) {
-                       unixname++;
-                       while (*unixname && isspace(*unixname))
-                               unixname++;
-               }
-    
-               if (!*unixname || strchr("#;",*unixname))
-                       continue;
+       info->disp_info.disp_group_info=grp_array;
 
-               if (strncmp(unixname, unix_user_name, strlen(unix_user_name)))
-                       continue;
+       for (i=0; i<group_entries; i++) {
+       
+               grp_array[i].grp=(DOMAIN_GRP *)malloc(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;
+       }
 
-               /* We have matched the UNIX user name */
+       SAFE_FREE(map);
 
-               while(next_token(&dosname, tok, LIST_SEP, sizeof(tok))) {
-                       if (!strchr("@&+", *tok)) {
-                               name_idx--;
-                               if (name_idx < 0 ) {
-                                       break;
-                               }
-                       }
-               }
+       /* the snapshoot is in memory, we're ready to enumerate fast */
 
-               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;
-               }
-       }
+       info->disp_info.group_dbloaded=True;
+
+       DEBUG(12,("load_group_domain_entries: done\n"));
 
-       DEBUG(0,("unmap_unixname: Couldn't find the UNIX user name\n"));
-       file_lines_free(lines);
-       return NULL;
+       return NT_STATUS_OK;
 }
 
+
 /*******************************************************************
- 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.)
-********************************************************************/
+  This next function should be replaced with something that
+  dynamically returns the correct user info..... 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 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)
 {
-       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;
-
-       DEBUG(5, ("get_passwd_entries: retrieving a list of UNIX users\n"));
-
+       SAM_ACCOUNT *pwd = NULL;
+       BOOL not_finished = True;
        (*num_entries) = 0;
        (*total_entries) = 0;
 
-       /* Skip all this stuff if we're in appliance mode */
-
-       if (lp_hide_local_users()) goto done;
-
-       if (pw_buf == NULL) return False;
-
-       if (current_idx == 0) {
-               sys_setpwent();
-       }
-
-       /* 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;
-
-                       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++;
-                       }
-
-                       if (unmap_name == NULL) {
-                               orig_done = False;
-                               mapped_idx = 0;
-                       }
-               }
-       } 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;
-                       }
+       if (pw_buf == NULL)
+               return NT_STATUS_NO_MEMORY;
 
-                       while (((unmap_name = unmap_unixname(pwd->pw_name, mapped_idx)) != NULL) && 
-                               (current_idx < start_idx)) {
-                               current_idx++;
-                               mapped_idx++;
-                       }
+       pdb_init_sam(&pwd);
 
-                       if (unmap_name == NULL) {
-                               orig_done = False;
-                               mapped_idx = 0;
-                       }
-               }
+       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) {
 
-       sep = lp_winbind_separator();
-
-       /* now current_idx == start_idx */
-       while ((*num_entries) < max_num_entries) {
-               int user_name_len;
-               char *unmap_name;
-
-               /* This does the original UNIX user itself */
-               if(!orig_done) {
-                       if ((pwd = sys_getpwent()) == NULL) break;
-
-                       /* Don't enumerate winbind users as they are not local */
-
-                       if (strchr(pwd->pw_name, *sep) != NULL) {
-                               continue;
-                       }
-
-                       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);
-
-                       pw_buf[(*num_entries)].acb_info = ACB_NORMAL;
-
-                       DEBUG(5, ("get_passwd_entries: entry idx %d user %s, rid 0x%x\n", (*num_entries), pwd->pw_name, pw_rid));
+                       pdb_reset_sam(pwd);
 
-                       (*num_entries)++;
-                       (*total_entries)++;
-                       current_idx++;
-                       orig_done = True;
+                       /* skip the requested number of entries.
+                          not very efficient, but hey...  */
+                       start_idx--;
+                       continue;
                }
-
-               /* 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);
-
-                       pw_buf[(*num_entries)].acb_info = ACB_NORMAL;
-
-                       DEBUG(5, ("get_passwd_entries: entry idx %d user %s, rid 0x%x\n", (*num_entries), pwd->pw_name, pw_rid));
-
+               
+               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 = 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",
+                         (*num_entries), pdb_get_username(pwd), pdb_get_user_rid(pwd), pdb_get_acct_ctrl(pwd) ));
+               
+               if (acb_mask == 0 || (pdb_get_acct_ctrl(pwd) & acb_mask)) {
+                       DEBUG(5,(" acb_mask %x accepts\n", acb_mask));
                        (*num_entries)++;
-                       (*total_entries)++;
-                       current_idx++;
-                       mapped_idx++;
+               } else {
+                       DEBUG(5,(" acb_mask %x rejects\n", acb_mask));
                }
 
-               if (unmap_name == NULL) {
-                       /* done with 'aliases', go on to next UNIX user */
-                       orig_done = False;
-                       mapped_idx = 0;
-               }
-       }
+               (*total_entries)++;
+               
+               pdb_reset_sam(pwd);
 
-       if (pwd == NULL) {
-               /* totally done, reset everything */
-               sys_endpwent();
-               current_idx = 0;
-               mapped_idx = 0;
        }
+       
+       pdb_endsampwent();
+       pdb_free_sam(&pwd);
 
-done:
-       return (*num_entries) > 0;
+       if (not_finished)
+               return STATUS_MORE_ENTRIES;
+       else
+               return NT_STATUS_OK;
 }
 
 /*******************************************************************
  _samr_close_hnd
  ********************************************************************/
 
-uint32 _samr_close_hnd(pipes_struct *p, SAMR_Q_CLOSE_HND *q_u, SAMR_R_CLOSE_HND *r_u)
+NTSTATUS _samr_close_hnd(pipes_struct *p, SAMR_Q_CLOSE_HND *q_u, SAMR_R_CLOSE_HND *r_u)
 {
-       r_u->status = NT_STATUS_NOPROBLEMO;
+       r_u->status = NT_STATUS_OK;
 
        /* close the policy handle */
        if (!close_policy_hnd(p, &q_u->pol))
@@ -477,23 +351,20 @@ uint32 _samr_close_hnd(pipes_struct *p, SAMR_Q_CLOSE_HND *q_u, SAMR_R_CLOSE_HND
  samr_reply_open_domain
  ********************************************************************/
 
-uint32 _samr_open_domain(pipes_struct *p, SAMR_Q_OPEN_DOMAIN *q_u, SAMR_R_OPEN_DOMAIN *r_u)
+NTSTATUS _samr_open_domain(pipes_struct *p, SAMR_Q_OPEN_DOMAIN *q_u, SAMR_R_OPEN_DOMAIN *r_u)
 {
        struct samr_info *info;
 
-       r_u->status = NT_STATUS_NOPROBLEMO;
+       r_u->status = NT_STATUS_OK;
 
        /* find the connection policy handle. */
        if (!find_policy_by_hnd(p, &q_u->pol, NULL))
                return NT_STATUS_INVALID_HANDLE;
 
        /* 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;
-
        /* get a (unique) handle.  open a policy on it. */
        if (!create_policy_hnd(p, &r_u->domain_pol, free_samr_info, (void *)info))
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
@@ -503,40 +374,32 @@ uint32 _samr_open_domain(pipes_struct *p, SAMR_Q_OPEN_DOMAIN *q_u, SAMR_R_OPEN_D
        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
  ********************************************************************/
 
-uint32 _samr_get_usrdom_pwinfo(pipes_struct *p, SAMR_Q_GET_USRDOM_PWINFO *q_u, SAMR_R_GET_USRDOM_PWINFO *r_u)
+NTSTATUS _samr_get_usrdom_pwinfo(pipes_struct *p, SAMR_Q_GET_USRDOM_PWINFO *q_u, SAMR_R_GET_USRDOM_PWINFO *r_u)
 {
        struct samr_info *info = NULL;
 
-       r_u->status = NT_STATUS_NOPROBLEMO;
+       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_NOPROBLEMO);
+       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;
 }
 
@@ -544,9 +407,8 @@ uint32 _samr_get_usrdom_pwinfo(pipes_struct *p, SAMR_Q_GET_USRDOM_PWINFO *q_u, S
  samr_make_usr_obj_sd
  ********************************************************************/
 
-static uint32 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_BUF **buf, DOM_SID *usr_sid)
 {
-       extern DOM_SID global_sid_Builtin;
        extern DOM_SID global_sid_World;
        DOM_SID adm_sid;
        DOM_SID act_sid;
@@ -583,7 +445,7 @@ static uint32 samr_make_usr_obj_sd(TALLOC_CTX *ctx, SEC_DESC_BUF **buf, DOM_SID
        if((*buf = make_sec_desc_buf(ctx, sd_size, psd)) == NULL)
                return NT_STATUS_NO_MEMORY;
 
-       return NT_STATUS_NOPROBLEMO;
+       return NT_STATUS_OK;
 }
 
 static BOOL get_lsa_policy_samr_sid(pipes_struct *p, POLICY_HND *pol, DOM_SID *sid)
@@ -605,20 +467,23 @@ static BOOL get_lsa_policy_samr_sid(pipes_struct *p, POLICY_HND *pol, DOM_SID *s
  _samr_query_sec_obj
  ********************************************************************/
 
-uint32 _samr_query_sec_obj(pipes_struct *p, SAMR_Q_QUERY_SEC_OBJ *q_u, SAMR_R_QUERY_SEC_OBJ *r_u)
+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;
 
-       r_u->status = NT_STATUS_NOPROBLEMO;
+       r_u->status = NT_STATUS_OK;
 
        /* Get the SID. */
 
        if (!get_lsa_policy_samr_sid(p, &q_u->user_pol, &pol_sid))
                return NT_STATUS_INVALID_HANDLE;
 
+       DEBUG(10,("_samr_query_sec_obj: querying security on SID: %s\n", sid_to_string(str_sid, &pol_sid)));
+
        r_u->status = samr_make_usr_obj_sd(p->mem_ctx, &r_u->buf, &pol_sid);
 
-       if (r_u->status == NT_STATUS_NOPROBLEMO)
+       if (NT_STATUS_IS_OK(r_u->status))
                r_u->ptr = 1;
 
        return r_u->status;
@@ -641,15 +506,18 @@ static void make_user_sam_entry_list(TALLOC_CTX *ctx, SAM_ENTRY **sam_pp, UNISTR
        if (num_sam_entries == 0)
                return;
 
-       sam = (SAM_ENTRY *)talloc(ctx, sizeof(SAM_ENTRY)*num_sam_entries);
+       sam = (SAM_ENTRY *)talloc_zero(ctx, sizeof(SAM_ENTRY)*num_sam_entries);
 
-       uni_name = (UNISTR2 *)talloc(ctx, sizeof(UNISTR2)*num_sam_entries);
+       uni_name = (UNISTR2 *)talloc_zero(ctx, sizeof(UNISTR2)*num_sam_entries);
 
        if (sam == NULL || uni_name == NULL) {
                DEBUG(0, ("NULL pointers in SAMR_R_QUERY_DISPINFO\n"));
                return;
        }
 
+       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;
 
@@ -665,14 +533,13 @@ static void make_user_sam_entry_list(TALLOC_CTX *ctx, SAM_ENTRY **sam_pp, UNISTR
  samr_reply_enum_dom_users
  ********************************************************************/
 
-uint32 _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;
-       BOOL ret;
        
-       r_u->status = NT_STATUS_NOPROBLEMO;
+       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))
@@ -681,12 +548,12 @@ uint32 _samr_enum_dom_users(pipes_struct *p, SAMR_Q_ENUM_DOM_USERS *q_u, SAMR_R_
        DEBUG(5,("_samr_enum_dom_users: %d\n", __LINE__));
 
        become_root();
-       ret = get_sampwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
+       r_u->status = get_sampwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
                                                                MAX_SAM_ENTRIES, q_u->acb_mask);
        unbecome_root();
 
-       if (!ret)
-               return NT_STATUS_ACCESS_DENIED;
+       if (NT_STATUS_IS_ERR(r_u->status))
+               return r_u->status;
 
        samr_clear_passwd_fields(pass, num_entries);
 
@@ -729,9 +596,9 @@ static void make_group_sam_entry_list(TALLOC_CTX *ctx, SAM_ENTRY **sam_pp, UNIST
        if (num_sam_entries == 0)
                return;
 
-       sam = (SAM_ENTRY *)talloc(ctx, sizeof(SAM_ENTRY)*num_sam_entries);
+       sam = (SAM_ENTRY *)talloc_zero(ctx, sizeof(SAM_ENTRY)*num_sam_entries);
 
-       uni_name = (UNISTR2 *)talloc(ctx, sizeof(UNISTR2)*num_sam_entries);
+       uni_name = (UNISTR2 *)talloc_zero(ctx, sizeof(UNISTR2)*num_sam_entries);
 
        if (sam == NULL || uni_name == NULL) {
                DEBUG(0, ("NULL pointers in SAMR_R_QUERY_DISPINFO\n"));
@@ -756,59 +623,102 @@ static void make_group_sam_entry_list(TALLOC_CTX *ctx, SAM_ENTRY **sam_pp, UNIST
  Get the group entries - similar to get_sampwd_entries().
  ********************************************************************/
 
-static BOOL get_group_alias_entries(DOMAIN_GRP *d_grp, DOM_SID *sid, uint32 start_idx,
+static NTSTATUS get_group_alias_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DOM_SID *sid, uint32 start_idx,
                                    uint32 *p_num_entries, uint32 max_entries)
 {
        fstring sid_str;
-       fstring sam_sid_str;
        uint32 num_entries = 0;
+       int i;
+       GROUP_MAP smap;
+       GROUP_MAP *map;
 
        sid_to_string(sid_str, sid);
-       sid_to_string(sam_sid_str, &global_sam_sid);
+       DEBUG(5, ("get_group_alias_entries: enumerating aliases on SID: %s\n", sid_str));
 
        *p_num_entries = 0;
 
        /* well-known aliases */
-       if (strequal(sid_str, "S-1-5-32")) {
-               char *name;
-               while (!lp_hide_local_users() &&
-                               num_entries < max_entries && 
-                               ((name = builtin_alias_rids[num_entries].name) != NULL)) {
-
-                       fstrcpy(d_grp[num_entries].name, name);
-                       d_grp[num_entries].rid = builtin_alias_rids[num_entries].rid;
-
-                       num_entries++;
+       if (sid_equal(sid, &global_sid_Builtin) && !lp_hide_local_users()) {
+               
+               enum_group_mapping(SID_NAME_ALIAS, &map, (int *)&num_entries, ENUM_ONLY_MAPPED, MAPPING_WITHOUT_PRIV);
+               
+               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+start_idx].sid, &(*d_grp)[i].rid);
+                               
+                       }
                }
-       } else if (strequal(sid_str, sam_sid_str) && !lp_hide_local_users()) {
-               char *name;
-               char *sep;
-               struct group *grp;
-
-               sep = lp_winbind_separator();
+               SAFE_FREE(map);
+               
+       } else if (sid_equal(sid, &global_sam_sid) && !lp_hide_local_users()) {
+               struct sys_grent *glist;
+               struct sys_grent *grp;
+               struct passwd *pw;
+               gid_t winbind_gid_low, winbind_gid_high;
+       
+               lp_winbind_gid(&winbind_gid_low, &winbind_gid_high);
 
                /* local aliases */
                /* we return the UNIX groups here.  This seems to be the right */
                /* thing to do, since NT member servers return their local     */
                 /* groups in the same situation.                               */
-               setgrent();
 
-               while (num_entries < max_entries && ((grp = getgrent()) != NULL)) {
-                       int i;
+               /* use getgrent_list() to retrieve the list of groups to avoid
+                * problems with getgrent possible infinite loop by internal
+                * libc grent structures overwrites by called functions */
+               grp = glist = getgrent_list();
+               if (grp == NULL)
+                       return NT_STATUS_NO_MEMORY;
+               
+               for (; (num_entries < max_entries) && (grp != NULL); grp = grp->next) {
                        uint32 trid;
-                       name = grp->gr_name;
+                       
+                       if(!get_group_from_gid(grp->gr_gid, &smap, MAPPING_WITHOUT_PRIV))
+                               continue;
+                       
+                       if (smap.sid_name_use!=SID_NAME_ALIAS) {
+                               continue;
+                       }
 
-                       /* Don't return winbind groups as they are not local! */
+                       sid_split_rid(&smap.sid, &trid);
+                       
+                       if (!sid_equal(sid, &smap.sid))
+                               continue;
 
-                       if (strchr(name, *sep) != NULL)
+                       /* Don't return winbind groups as they are not local! */
+                       if ((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... */
+                       
+                       /* 
+                        *  We used to do a Get_Pwnam() here, but this has been
+                        * trimmed back to the common case for private groups
+                        * to save lookups and to use the _alloc interface.
+                        *
+                        * This also matches the group mapping code
+                        */
+
+                       if ((pw = getpwnam_alloc(smap.nt_name)) != 0) {
+                               DEBUG(10,("get_group_alias_entries: not returing %s, clashes with user.\n", smap.nt_name ));
+                               passwd_free(&pw);
+                               continue;                       
+                       }
 
-                       trid = pdb_gid_to_group_rid(grp->gr_gid);
                        for( i = 0; i < num_entries; i++)
-                               if ( d_grp[i].rid == trid ) break;
+                               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... */
 
@@ -820,52 +730,72 @@ static BOOL get_group_alias_entries(DOMAIN_GRP *d_grp, DOM_SID *sid, uint32 star
                                continue;
                        }
 
-                       fstrcpy(d_grp[num_entries].name, name);
-                       d_grp[num_entries].rid = trid;
+                       *d_grp=talloc_realloc(ctx,*d_grp, (num_entries+1)*sizeof(DOMAIN_GRP));
+                       if (*d_grp==NULL) {
+                               grent_free(glist);
+                               return NT_STATUS_NO_MEMORY;
+                       }
+
+                       fstrcpy((*d_grp)[num_entries].name, smap.nt_name);
+                       (*d_grp)[num_entries].rid = trid;
                        num_entries++;
+                       DEBUG(10,("get_group_alias_entries: added entry %d, rid:%d\n", num_entries, trid));
                }
 
-               endgrent();
+               grent_free(glist);
        }
 
        *p_num_entries = num_entries;
 
-       return True;
+       DEBUG(10,("get_group_alias_entries: returning %d entries\n", *p_num_entries));
+
+       if (num_entries >= max_entries)
+               return STATUS_MORE_ENTRIES;
+       return NT_STATUS_OK;
 }
 
 /*******************************************************************
  Get the group entries - similar to get_sampwd_entries().
  ********************************************************************/
 
-static BOOL get_group_domain_entries(DOMAIN_GRP *d_grp, DOM_SID *sid, uint32 start_idx,
+static NTSTATUS get_group_domain_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DOM_SID *sid, uint32 start_idx,
                                     uint32 *p_num_entries, uint32 max_entries)
 {
-       fstring sid_str;
-       fstring sam_sid_str;
+       GROUP_MAP *map=NULL;
+       int i;
+       uint32 group_entries = 0;
        uint32 num_entries = 0;
-       fstring name="Domain Admins";
-       fstring comment="Just to make it work !";
-
-       sid_to_string(sid_str, sid);
-       sid_to_string(sam_sid_str, &global_sam_sid);
 
        *p_num_entries = 0;
 
-       fstrcpy(d_grp[0].name, name);
-       fstrcpy(d_grp[0].comment, comment);
-       d_grp[0].rid = DOMAIN_GROUP_RID_ADMINS;
-       d_grp[0].attr=SID_NAME_DOM_GRP;
+       enum_group_mapping(SID_NAME_DOM_GRP, &map, (int *)&group_entries, ENUM_ONLY_MAPPED, MAPPING_WITHOUT_PRIV);
+
+       num_entries=group_entries-start_idx;
 
-       fstrcpy(d_grp[1].name, "Domain Users");
-       fstrcpy(d_grp[1].comment, "Just to make it work !");
-       d_grp[1].rid = DOMAIN_GROUP_RID_USERS;
-       d_grp[1].attr=SID_NAME_DOM_GRP;
+       /* limit the number of entries */
+       if (num_entries>max_entries) {
+               DEBUG(5,("Limiting to %d entries\n", max_entries));
+               num_entries=max_entries;
+       }
+
+       *d_grp=(DOMAIN_GRP *)talloc_zero(ctx, num_entries*sizeof(DOMAIN_GRP));
+       if (num_entries!=0 && *d_grp==NULL){
+               SAFE_FREE(map);
+               return NT_STATUS_NO_MEMORY;
+       }
+       
+       for (i=0; i<num_entries; i++) {
+               fstrcpy((*d_grp)[i].name, map[i+start_idx].nt_name);
+               fstrcpy((*d_grp)[i].comment, map[i+start_idx].comment);
+               sid_split_rid(&map[i+start_idx].sid, &(*d_grp)[i].rid);
+               (*d_grp)[i].attr=SID_NAME_DOM_GRP;
+       }
 
-       num_entries = 2;
+       SAFE_FREE(map);
 
        *p_num_entries = num_entries;
 
-       return True;
+       return NT_STATUS_OK;
 }
 
 /*******************************************************************
@@ -874,20 +804,21 @@ static BOOL get_group_domain_entries(DOMAIN_GRP *d_grp, DOM_SID *sid, uint32 sta
  a real PDC. JRA.
  ********************************************************************/
 
-uint32 _samr_enum_dom_groups(pipes_struct *p, SAMR_Q_ENUM_DOM_GROUPS *q_u, SAMR_R_ENUM_DOM_GROUPS *r_u)
+NTSTATUS _samr_enum_dom_groups(pipes_struct *p, SAMR_Q_ENUM_DOM_GROUPS *q_u, SAMR_R_ENUM_DOM_GROUPS *r_u)
 {
-       DOMAIN_GRP grp[2];
+       DOMAIN_GRP *grp=NULL;
        uint32 num_entries;
        DOM_SID sid;
 
-       r_u->status = NT_STATUS_NOPROBLEMO;
+       r_u->status = NT_STATUS_OK;
 
        if (!get_lsa_policy_samr_sid(p, &q_u->pol, &sid))
                return NT_STATUS_INVALID_HANDLE;
 
        DEBUG(5,("samr_reply_enum_dom_groups: %d\n", __LINE__));
 
-       get_group_domain_entries(grp, &sid, q_u->start_idx, &num_entries, MAX_SAM_ENTRIES);
+       /* 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);
 
        make_group_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_grp_name, num_entries, grp);
 
@@ -903,14 +834,15 @@ uint32 _samr_enum_dom_groups(pipes_struct *p, SAMR_Q_ENUM_DOM_GROUPS *q_u, SAMR_
  samr_reply_enum_dom_aliases
  ********************************************************************/
 
-uint32 _samr_enum_dom_aliases(pipes_struct *p, SAMR_Q_ENUM_DOM_ALIASES *q_u, SAMR_R_ENUM_DOM_ALIASES *r_u)
+NTSTATUS _samr_enum_dom_aliases(pipes_struct *p, SAMR_Q_ENUM_DOM_ALIASES *q_u, SAMR_R_ENUM_DOM_ALIASES *r_u)
 {
-       DOMAIN_GRP grp[MAX_SAM_ENTRIES];
+       DOMAIN_GRP *grp=NULL;
        uint32 num_entries = 0;
        fstring sid_str;
        DOM_SID sid;
+       NTSTATUS status;
        
-       r_u->status = NT_STATUS_NOPROBLEMO;
+       r_u->status = NT_STATUS_OK;
 
        if (!get_lsa_policy_samr_sid(p, &q_u->pol, &sid))
                return NT_STATUS_INVALID_HANDLE;
@@ -918,12 +850,15 @@ uint32 _samr_enum_dom_aliases(pipes_struct *p, SAMR_Q_ENUM_DOM_ALIASES *q_u, SAM
        sid_to_string(sid_str, &sid);
        DEBUG(5,("samr_reply_enum_dom_aliases: sid %s\n", sid_str));
 
-       if (!get_group_alias_entries(grp, &sid, q_u->start_idx, &num_entries, MAX_SAM_ENTRIES))
-               return NT_STATUS_ACCESS_DENIED;
+       status = get_group_alias_entries(p->mem_ctx, &grp, &sid, q_u->start_idx, 
+                                        &num_entries, MAX_SAM_ENTRIES);
+       if (NT_STATUS_IS_ERR(status)) return status;
 
        make_group_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_grp_name, num_entries, grp);
 
-       init_samr_r_enum_dom_aliases(r_u, q_u->start_idx, num_entries);
+       /*safe_free(grp);*/
+
+       init_samr_r_enum_dom_aliases(r_u, q_u->start_idx + num_entries, num_entries);
 
        DEBUG(5,("samr_enum_dom_aliases: %d\n", __LINE__));
 
@@ -933,141 +868,200 @@ uint32 _samr_enum_dom_aliases(pipes_struct *p, SAMR_Q_ENUM_DOM_ALIASES *q_u, SAM
 /*******************************************************************
  samr_reply_query_dispinfo
  ********************************************************************/
-
-uint32 _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[MAX_SAM_ENTRIES];
-       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;
-       BOOL ret;
+       struct samr_info *info = NULL;
+       uint32 struct_size=0x20; /* W2K always reply that, client doesn't care */
+       uint16 acb_mask;
+       
+       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;
 
-       DEBUG(5, ("samr_reply_query_dispinfo: %d\n", __LINE__));
+       max_sam_entries = (ra_type == RA_WIN95) ? MAX_SAM_ENTRIES_W95 : MAX_SAM_ENTRIES_W2K;
 
-       r_u->status = NT_STATUS_NOPROBLEMO;
+       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 */
+       /*
+        * 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
+        */
 
-       if(q_u->max_entries > MAX_SAM_ENTRIES)
-               q_u->max_entries = MAX_SAM_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:
+
+       if (q_u->switch_level==2)
                acb_mask = ACB_WSTRUST;
-               /* Fall through */
-       case 0x1:
-       case 0x4:
-               become_root();
-#if 0
-               ret = get_passwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
-                                               MAX_SAM_ENTRIES, acb_mask);
-#endif
-#if 0
-       /*
-        * Which should we use here ? JRA.
-        */
-               ret = get_sampwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
-                                               MAX_SAM_ENTRIES, acb_mask);
-#endif
-#if 1
-               ret = jf_get_sampwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
-                                               MAX_SAM_ENTRIES, acb_mask);
-#endif
-               unbecome_root();
-               if (!ret) {
-                       DEBUG(5, ("get_sampwd_entries: failed\n"));
-                       return NT_STATUS_ACCESS_DENIED;
-               }
-               break;
-       case 0x3:
-       case 0x5:
-               ret = get_group_domain_entries(grps, &sid, q_u->start_idx, &num_entries, MAX_SAM_ENTRIES);
-               if (!ret)
-                       return NT_STATUS_ACCESS_DENIED;
-               break;
-       default:
-               DEBUG(0,("_samr_query_dispinfo: Unknown info level (%u)\n", (unsigned int)q_u->switch_level ));
-               return NT_STATUS_INVALID_INFO_CLASS;
+       else
+               acb_mask = ACB_NORMAL;
+
+       /* Get what we need from the password database */
+       switch (q_u->switch_level) {
+               case 0x1:
+               case 0x2:
+               case 0x4:
+                       become_root();          
+                       r_u->status=load_sampwd_entries(info, acb_mask);
+                       unbecome_root();
+                       if (NT_STATUS_IS_ERR(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_ERR(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;
        }
 
+       /* 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 > q_u->max_entries)
-               num_entries = q_u->max_entries;
+       if (enum_context > num_account) {
+               DEBUG(5, ("samr_reply_query_dispinfo: enumeration handle over total entries\n"));
+               return NT_STATUS_OK;
+       }
 
-       if (num_entries > MAX_SAM_ENTRIES) {
-               num_entries = MAX_SAM_ENTRIES;
-               DEBUG(5, ("limiting number of entries to %d\n", 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));
        }
 
-       /* Ensure password info is never given out here. PARANOIA... JRA */
-       samr_clear_passwd_fields(pass, num_entries);
+       /* calculate the size and limit on the number of entries we will return */
+       temp_size=(enum_context+max_entries)*struct_size;
+       
+       if (temp_size>max_size) {
+               max_entries=max_size/struct_size;
+               DEBUG(5, ("samr_reply_query_dispinfo: buffer size limits to only %d entries\n", max_entries));
+       }
 
-       data_size = q_u->max_size;
-       orig_num_entries = num_entries;
+       if (!(ctr = (SAM_DISPINFO_CTR *)talloc_zero(p->mem_ctx,sizeof(SAM_DISPINFO_CTR))))
+               return NT_STATUS_NO_MEMORY;
 
-       ctr = (SAM_DISPINFO_CTR *)talloc(p->mem_ctx,sizeof(SAM_DISPINFO_CTR));
+       ZERO_STRUCTP(ctr);
 
        /* Now create reply structure */
        switch (q_u->switch_level) {
        case 0x1:
-               ctr->sam.info1 = (SAM_DISPINFO_1 *)talloc(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_1));
-               init_sam_dispinfo_1(ctr->sam.info1, &num_entries, &data_size, q_u->start_idx, pass);
+               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, max_entries, enum_context, info->disp_info.disp_user_info);
+               if (NT_STATUS_IS_ERR(disp_ret))
+                       return disp_ret;
                break;
        case 0x2:
-               ctr->sam.info2 = (SAM_DISPINFO_2 *)talloc(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_2));
-               init_sam_dispinfo_2(ctr->sam.info2, &num_entries, &data_size, q_u->start_idx, pass);
+               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, max_entries, enum_context, info->disp_info.disp_user_info);
+               if (NT_STATUS_IS_ERR(disp_ret))
+                       return disp_ret;
                break;
        case 0x3:
-               ctr->sam.info3 = (SAM_DISPINFO_3 *)talloc(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_3));
-               init_sam_dispinfo_3(ctr->sam.info3, &num_entries, &data_size, q_u->start_idx, grps);
+               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, max_entries, enum_context, info->disp_info.disp_group_info);
+               if (NT_STATUS_IS_ERR(disp_ret))
+                       return disp_ret;
                break;
        case 0x4:
-               ctr->sam.info4 = (SAM_DISPINFO_4 *)talloc(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_4));
-               init_sam_dispinfo_4(ctr->sam.info4, &num_entries, &data_size, q_u->start_idx, pass);
+               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, max_entries, enum_context, info->disp_info.disp_user_info);
+               if (NT_STATUS_IS_ERR(disp_ret))
+                       return disp_ret;
                break;
        case 0x5:
-               ctr->sam.info5 = (SAM_DISPINFO_5 *)talloc(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_5));
-               init_sam_dispinfo_5(ctr->sam.info5, &num_entries, &data_size, q_u->start_idx, grps);
+               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, max_entries, enum_context, info->disp_info.disp_group_info);
+               if (NT_STATUS_IS_ERR(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;
 
-       init_samr_r_query_dispinfo(r_u, num_entries, data_size, q_u->switch_level, ctr, r_u->status);
+       if (enum_context+max_entries < num_account)
+               r_u->status = STATUS_MORE_ENTRIES;
 
-       if (num_entries < orig_num_entries) {
-               return STATUS_MORE_ENTRIES;
-       }
+       DEBUG(5, ("_samr_query_dispinfo: %d\n", __LINE__));
+
+       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;
+
 }
 
 /*******************************************************************
  samr_reply_query_aliasinfo
  ********************************************************************/
 
-uint32 _samr_query_aliasinfo(pipes_struct *p, SAMR_Q_QUERY_ALIASINFO *q_u, SAMR_R_QUERY_ALIASINFO *r_u)
+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;
+       GROUP_MAP map;
 
-       r_u->status = NT_STATUS_NOPROBLEMO;
+       r_u->status = NT_STATUS_OK;
 
        DEBUG(5,("_samr_query_aliasinfo: %d\n", __LINE__));
 
@@ -1075,18 +1069,23 @@ uint32 _samr_query_aliasinfo(pipes_struct *p, SAMR_Q_QUERY_ALIASINFO *q_u, SAMR_
        if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       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(&info->sid) &&
+           !sid_check_is_in_builtin(&info->sid))
+               return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-       if(!local_lookup_rid(alias_rid, alias, &type))
+       if(!get_local_group_from_sid(info->sid, &map, 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;
@@ -1107,7 +1106,7 @@ uint32 _samr_query_aliasinfo(pipes_struct *p, SAMR_Q_QUERY_ALIASINFO *q_u, SAMR_
     uint32 rid[MAX_SAM_ENTRIES];
     int num_rids = q_u->num_sids1;
 
-    r_u->status = NT_STATUS_NOPROBLEMO;
+    r_u->status = NT_STATUS_OK;
 
     DEBUG(5,("_samr_lookup_ids: %d\n", __LINE__));
 
@@ -1149,7 +1148,7 @@ uint32 _samr_query_aliasinfo(pipes_struct *p, SAMR_Q_QUERY_ALIASINFO *q_u, SAMR_
     num_rids = 1;
     rid[0] = BUILTIN_ALIAS_RID_USERS;
 
-    init_samr_r_lookup_ids(&r_u, num_rids, rid, NT_STATUS_NOPROBLEMO);
+    init_samr_r_lookup_ids(&r_u, num_rids, rid, NT_STATUS_OK);
 
     DEBUG(5,("_samr_lookup_ids: %d\n", __LINE__));
 
@@ -1161,77 +1160,106 @@ uint32 _samr_query_aliasinfo(pipes_struct *p, SAMR_Q_QUERY_ALIASINFO *q_u, SAMR_
  _samr_lookup_names
  ********************************************************************/
 
-uint32 _samr_lookup_names(pipes_struct *p, SAMR_Q_LOOKUP_NAMES *q_u, SAMR_R_LOOKUP_NAMES *r_u)
+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_names1;
-    DOM_SID pol_sid;
-
-    r_u->status = NT_STATUS_NOPROBLEMO;
-
-    DEBUG(5,("_samr_lookup_names: %d\n", __LINE__));
-
-    ZERO_ARRAY(rid);
-    ZERO_ARRAY(type);
-
-    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;
-    }
+       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;
 
-    if (num_rids > MAX_SAM_ENTRIES) {
-        num_rids = MAX_SAM_ENTRIES;
-        DEBUG(5,("_samr_lookup_names: truncating entries to %d\n", num_rids));
-    }
+       r_u->status = NT_STATUS_OK;
 
-    SMB_ASSERT_ARRAY(q_u->uni_name, num_rids);
+       DEBUG(5,("_samr_lookup_names: %d\n", __LINE__));
 
-    for (i = 0; i < num_rids; i++) {
-        fstring name;
+       ZERO_ARRAY(rid);
+       ZERO_ARRAY(type);
 
-        r_u->status = NT_STATUS_NONE_MAPPED;
+       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;
+       }
 
-        rid [i] = 0xffffffff;
-        type[i] = SID_NAME_UNKNOWN;
+       if (num_rids > MAX_SAM_ENTRIES) {
+               num_rids = MAX_SAM_ENTRIES;
+               DEBUG(5,("_samr_lookup_names: truncating entries to %d\n", num_rids));
+       }
 
-        fstrcpy(name, rpc_unistrn2(q_u->uni_name[i].buffer, q_u->uni_name[i].uni_str_len, p->endian));
+       DEBUG(5,("_samr_lookup_names: looking name on SID %s\n", sid_to_string(sid_str, &pol_sid)));
 
-        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_NOPROBLEMO;
-            }
-        }
-    }
+       for (i = 0; i < num_rids; i++) {
+               fstring name;
+               DOM_SID sid;
+
+               r_u->status = NT_STATUS_NONE_MAPPED;
+
+               rid [i] = 0xffffffff;
+               type[i] = SID_NAME_UNKNOWN;
+
+               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(local_lookup_name(global_myname, 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;
+                       }
+               }
+       }
 
-    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;
 }
 
 /*******************************************************************
  _samr_chgpasswd_user
  ********************************************************************/
 
-uint32 _samr_chgpasswd_user(pipes_struct *p, SAMR_Q_CHGPASSWD_USER *q_u, SAMR_R_CHGPASSWD_USER *r_u)
+NTSTATUS _samr_chgpasswd_user(pipes_struct *p, SAMR_Q_CHGPASSWD_USER *q_u, SAMR_R_CHGPASSWD_USER *r_u)
 {
     fstring user_name;
     fstring wks;
 
     DEBUG(5,("_samr_chgpasswd_user: %d\n", __LINE__));
 
-    r_u->status = NT_STATUS_NOPROBLEMO;
+    r_u->status = NT_STATUS_OK;
 
-    fstrcpy(user_name, rpc_unistrn2(q_u->uni_user_name.buffer, q_u->uni_user_name.uni_str_len, p->endian));
-    fstrcpy(wks      , rpc_unistrn2(q_u->uni_dest_host.buffer, q_u->uni_dest_host.uni_str_len, p->endian));
+    rpcstr_pull(user_name, q_u->uni_user_name.buffer, sizeof(user_name), q_u->uni_user_name.uni_str_len*2, 0);
+    rpcstr_pull(wks, q_u->uni_dest_host.buffer, sizeof(wks), q_u->uni_dest_host.uni_str_len*2,0);
 
     DEBUG(5,("samr_chgpasswd_user: user: %s wks: %s\n", user_name, wks));
 
+       /*
+        * Pass the user through the NT -> unix user mapping
+        * function.
+        */
+       (void)map_username(user_name);
+       /*
+        * UNIX username case mangling not required, pass_oem_change 
+        * is case insensitive.
+        */
+
     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;
@@ -1251,18 +1279,18 @@ static BOOL make_samr_lookup_rids(TALLOC_CTX *ctx, uint32 num_names, fstring nam
            UNIHDR **pp_hdr_name, UNISTR2 **pp_uni_name)
 {
        uint32 i;
-       UNIHDR *hdr_name;
-       UNISTR2 *uni_name;
+       UNIHDR *hdr_name=NULL;
+       UNISTR2 *uni_name=NULL;
 
        *pp_uni_name = NULL;
        *pp_hdr_name = NULL;
 
        if (num_names != 0) {
-               hdr_name = (UNIHDR *)talloc(ctx, sizeof(UNIHDR)*num_names);
+               hdr_name = (UNIHDR *)talloc_zero(ctx, sizeof(UNIHDR)*num_names);
                if (hdr_name == NULL)
                        return False;
 
-               uni_name = (UNISTR2 *)talloc(ctx,sizeof(UNISTR2)*num_names);
+               uni_name = (UNISTR2 *)talloc_zero(ctx,sizeof(UNISTR2)*num_names);
                if (uni_name == NULL)
                        return False;
        }
@@ -1284,17 +1312,17 @@ static BOOL make_samr_lookup_rids(TALLOC_CTX *ctx, uint32 num_names, fstring nam
  _samr_lookup_rids
  ********************************************************************/
 
-uint32 _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOKUP_RIDS *r_u)
+NTSTATUS _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOKUP_RIDS *r_u)
 {
        fstring group_names[MAX_SAM_ENTRIES];
-       uint32 group_attrs[MAX_SAM_ENTRIES];
+       uint32 *group_attrs = NULL;
        UNIHDR *hdr_name = NULL;
        UNISTR2 *uni_name = NULL;
        DOM_SID pol_sid;
        int num_rids = q_u->num_rids1;
        int i;
 
-       r_u->status = NT_STATUS_NOPROBLEMO;
+       r_u->status = NT_STATUS_OK;
 
        DEBUG(5,("_samr_lookup_rids: %d\n", __LINE__));
 
@@ -1307,6 +1335,11 @@ uint32 _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOKUP
                DEBUG(5,("_samr_lookup_rids: truncating entries to %d\n", num_rids));
        }
 
+       if (num_rids) {
+               if ((group_attrs = (uint32 *)talloc_zero(p->mem_ctx, num_rids * sizeof(uint32))) == NULL)
+                       return NT_STATUS_NO_MEMORY;
+       }
        r_u->status = NT_STATUS_NONE_MAPPED;
 
        for (i = 0; i < num_rids; i++) {
@@ -1323,9 +1356,10 @@ uint32 _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOKUP
                        sid_append_rid(&sid, q_u->rid[i]);
 
                        if (lookup_sid(&sid, domname, tmpname, &type)) {
-                               r_u->status = NT_STATUS_NOPROBLEMO;
+                               r_u->status = NT_STATUS_OK;
                                group_attrs[i] = (uint32)type;
                                fstrcpy(group_names[i],tmpname);
+                               DEBUG(5,("_samr_lookup_rids: %s:%d\n", group_names[i], group_attrs[i]));
                        }
                }
        }
@@ -1344,51 +1378,53 @@ uint32 _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOKUP
  _api_samr_open_user. Safe - gives out no passwd info.
  ********************************************************************/
 
-uint32 _api_samr_open_user(pipes_struct *p, SAMR_Q_OPEN_USER *q_u, SAMR_R_OPEN_USER *r_u)
+NTSTATUS _api_samr_open_user(pipes_struct *p, SAMR_Q_OPEN_USER *q_u, SAMR_R_OPEN_USER *r_u)
 {
-    SAM_ACCOUNT *sampass;
-    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;
+       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;
+       BOOL ret;
 
-    r_u->status = NT_STATUS_NO_PROBLEMO;
+       r_u->status = NT_STATUS_OK;
 
-    /* find the domain policy handle. */
-    if (!find_policy_by_hnd(p, &domain_pol, NULL))
-        return NT_STATUS_INVALID_HANDLE;
+       /* find the domain policy handle. */
+       if (!find_policy_by_hnd(p, &domain_pol, NULL))
+               return NT_STATUS_INVALID_HANDLE;
 
-    become_root();
-    sampass = pdb_getsampwrid(user_rid);
-    unbecome_root();
+       pdb_init_sam(&sampass);
 
-    /* check that the RID exists in our domain. */
-    if (sampass == NULL)
-        return NT_STATUS_NO_SUCH_USER;
+       become_root();
+       ret=pdb_getsampwrid(sampass, user_rid);
+       unbecome_root();
 
-       samr_clear_sam_passwd(sampass);
+       /* check that the RID exists in our domain. */
+       if (ret == False) {
+               pdb_free_sam(&sampass);
+               return NT_STATUS_NO_SUCH_USER;
+       }
 
-    /* Get the domain SID stored in the domain policy */
-    if(!get_lsa_policy_samr_sid(p, &domain_pol, &sid))
-        return NT_STATUS_INVALID_HANDLE;
+       pdb_free_sam(&sampass);
 
-    /* append the user's RID to it */
-    if(!sid_append_rid(&sid, user_rid))
-        return NT_STATUS_NO_SUCH_USER;
+       /* Get the domain SID stored in the domain policy */
+       if(!get_lsa_policy_samr_sid(p, &domain_pol, &sid))
+               return NT_STATUS_INVALID_HANDLE;
 
-    /* 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;
+       /* append the user's RID to it */
+       if(!sid_append_rid(&sid, user_rid))
+               return NT_STATUS_NO_SUCH_USER;
 
-    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;
 
-    /* get a (unique) handle.  open a policy on it. */
-    if (!create_policy_hnd(p, user_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, user_pol, free_samr_info, (void *)info))
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 
-    return r_u->status;
+       return r_u->status;
 }
 
 /*************************************************************************
@@ -1397,27 +1433,34 @@ uint32 _api_samr_open_user(pipes_struct *p, SAMR_Q_OPEN_USER *q_u, SAMR_R_OPEN_U
 
 static BOOL get_user_info_10(SAM_USER_INFO_10 *id10, uint32 user_rid)
 {
-    SAM_ACCOUNT *smbpass;
+       SAM_ACCOUNT *smbpass=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;
-    }
+       if (!pdb_rid_is_user(user_rid)) {
+               DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
+               return False;
+       }
 
-    become_root();
-    smbpass = pdb_getsampwrid(user_rid);
-    unbecome_root();
+       pdb_init_sam(&smbpass);
 
-    if (smbpass == NULL) {
-        DEBUG(4,("User 0x%x not found\n", user_rid));
-        return False;
-    }
+       become_root();
+       ret = pdb_getsampwrid(smbpass, user_rid);
+       unbecome_root();
+
+       if (ret==False) {
+               DEBUG(4,("User 0x%x not found\n", user_rid));
+               pdb_free_sam(&smbpass);
+               return False;
+       }
 
-    DEBUG(3,("User:[%s]\n", pdb_get_username(smbpass) ));
+       DEBUG(3,("User:[%s]\n", pdb_get_username(smbpass) ));
 
-    init_sam_user_info10(id10, pdb_get_acct_ctrl(smbpass) );
+       ZERO_STRUCTP(id10);
+       init_sam_user_info10(id10, pdb_get_acct_ctrl(smbpass) );
 
-    return True;
+       pdb_free_sam(&smbpass);
+
+       return True;
 }
 
 /*************************************************************************
@@ -1426,9 +1469,10 @@ static BOOL get_user_info_10(SAM_USER_INFO_10 *id10, uint32 user_rid)
  user. JRA. 
  *************************************************************************/
 
-static uint32 get_user_info_12(pipes_struct *p, SAM_USER_INFO_12 * id12, uint32 user_rid)
+static NTSTATUS get_user_info_12(pipes_struct *p, SAM_USER_INFO_12 * id12, uint32 user_rid)
 {
-    SAM_ACCOUNT *smbpass;
+       SAM_ACCOUNT *smbpass=NULL;
+       BOOL ret;
 
        if (!p->ntlmssp_auth_validated)
                return NT_STATUS_ACCESS_DENIED;
@@ -1439,22 +1483,67 @@ static uint32 get_user_info_12(pipes_struct *p, SAM_USER_INFO_12 * id12, uint32
        /*
         * Do *NOT* do become_root()/unbecome_root() here ! JRA.
         */
+       pdb_init_sam(&smbpass);
 
-    smbpass = pdb_getsampwrid(user_rid);
+       ret = pdb_getsampwrid(smbpass, user_rid);
 
-       if (smbpass == NULL) {
+       if (ret == False) {
                DEBUG(4, ("User 0x%x not found\n", user_rid));
+               pdb_free_sam(&smbpass);
                return (geteuid() == (uid_t)0) ? NT_STATUS_NO_SUCH_USER : NT_STATUS_ACCESS_DENIED;
        }
 
-    DEBUG(3,("User:[%s] 0x%x\n", pdb_get_username(smbpass), pdb_get_acct_ctrl(smbpass) ));
+       DEBUG(3,("User:[%s] 0x%x\n", pdb_get_username(smbpass), pdb_get_acct_ctrl(smbpass) ));
 
-       if ( pdb_get_acct_ctrl(smbpass) & ACB_DISABLED)
-        return NT_STATUS_ACCOUNT_DISABLED;
+       if ( pdb_get_acct_ctrl(smbpass) & ACB_DISABLED) {
+               pdb_free_sam(&smbpass);
+               return NT_STATUS_ACCOUNT_DISABLED;
+       }
 
+       ZERO_STRUCTP(id12);
        init_sam_user_info12(id12, pdb_get_lanman_passwd(smbpass), pdb_get_nt_passwd(smbpass));
+       
+       pdb_free_sam(&smbpass);
+
+       return NT_STATUS_OK;
+}
+
+/*************************************************************************
+ get_user_info_20
+ *************************************************************************/
 
-       return NT_STATUS_NOPROBLEMO;
+static BOOL get_user_info_20(SAM_USER_INFO_20 *id20, uint32 user_rid)
+{
+       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);
+
+       become_root();
+       ret = pdb_getsampwrid(sampass, user_rid);
+       unbecome_root();
+
+       if (ret == False) {
+               DEBUG(4,("User 0x%x not found\n", user_rid));
+               pdb_free_sam(&sampass);
+               return False;
+       }
+
+       samr_clear_sam_passwd(sampass);
+
+       DEBUG(3,("User:[%s]\n",  pdb_get_username(sampass) ));
+
+       ZERO_STRUCTP(id20);
+       init_sam_user_info20A(id20, sampass);
+       
+       pdb_free_sam(&sampass);
+
+       return True;
 }
 
 /*************************************************************************
@@ -1463,54 +1552,62 @@ static uint32 get_user_info_12(pipes_struct *p, SAM_USER_INFO_12 * id12, uint32
 
 static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
 {
-    SAM_ACCOUNT *sampass;
+       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;
-    }
+       if (!pdb_rid_is_user(user_rid)) {
+               DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
+               return False;
+       }
 
-    become_root();
-    sampass = pdb_getsampwrid(user_rid);
-    unbecome_root();
+       pdb_init_sam(&sampass);
 
-    if (sampass == NULL) {
-        DEBUG(4,("User 0x%x not found\n", user_rid));
-        return False;
-    }
+       become_root();
+       ret = pdb_getsampwrid(sampass, user_rid);
+       unbecome_root();
+
+       if (ret == False) {
+               DEBUG(4,("User 0x%x not found\n", user_rid));
+               pdb_free_sam(&sampass);
+               return False;
+       }
 
        samr_clear_sam_passwd(sampass);
 
-    DEBUG(3,("User:[%s]\n",  pdb_get_username(sampass) ));
+       DEBUG(3,("User:[%s]\n",  pdb_get_username(sampass) ));
 
+       ZERO_STRUCTP(id21);
        init_sam_user_info21A(id21, sampass);
+       
+       pdb_free_sam(&sampass);
 
-    return True;
+       return True;
 }
 
 /*******************************************************************
  _samr_query_userinfo
  ********************************************************************/
 
-uint32 _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_R_QUERY_USERINFO *r_u)
+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;
 
-       r_u->status=NT_STATUS_NO_PROBLEMO;
+       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)
+       if (!sid_check_is_in_our_domain(&info->sid))
                return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
+       sid_peek_rid(&info->sid, &rid);
+
        DEBUG(5,("_samr_query_userinfo: rid:0x%x\n", rid));
 
-       ctr = (SAM_USERINFO_CTR *)talloc(p->mem_ctx, sizeof(SAM_USERINFO_CTR));
+       ctr = (SAM_USERINFO_CTR *)talloc_zero(p->mem_ctx, sizeof(SAM_USERINFO_CTR));
        if (!ctr)
                return NT_STATUS_NO_MEMORY;
 
@@ -1521,7 +1618,7 @@ uint32 _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_R_
 
        switch (q_u->switch_value) {
        case 0x10:
-               ctr->info.id10 = (SAM_USER_INFO_10 *)talloc(p->mem_ctx, sizeof(SAM_USER_INFO_10));
+               ctr->info.id10 = (SAM_USER_INFO_10 *)talloc_zero(p->mem_ctx, sizeof(SAM_USER_INFO_10));
                if (ctr->info.id10 == NULL)
                        return NT_STATUS_NO_MEMORY;
 
@@ -1539,11 +1636,12 @@ uint32 _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_R_
             expire.low = 0xffffffff;
             expire.high = 0x7fffffff;
 
-            ctr->info.id = (SAM_USER_INFO_11 *)talloc(p->mem_ctx,
+            ctr->info.id = (SAM_USER_INFO_11 *)talloc_zero(p->mem_ctx,
                                     sizeof
                                     (*ctr->
                                      info.
                                      id11));
+           ZERO_STRUCTP(ctr->info.id11);
             init_sam_user_info11(ctr->info.id11, &expire,
                          "BROOKFIELDS$",    /* name */
                          0x03ef,    /* user rid */
@@ -1555,16 +1653,24 @@ uint32 _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_R_
 #endif
 
        case 0x12:
-               ctr->info.id12 = (SAM_USER_INFO_12 *)talloc(p->mem_ctx, sizeof(SAM_USER_INFO_12));
+               ctr->info.id12 = (SAM_USER_INFO_12 *)talloc_zero(p->mem_ctx, sizeof(SAM_USER_INFO_12));
                if (ctr->info.id12 == NULL)
                        return NT_STATUS_NO_MEMORY;
 
-               if ((r_u->status = get_user_info_12(p, ctr->info.id12, rid)) != NT_STATUS_NOPROBLEMO)
+               if (NT_STATUS_IS_ERR(r_u->status = get_user_info_12(p, ctr->info.id12, rid)))
                        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;
+               break;
+
        case 21:
-               ctr->info.id21 = (SAM_USER_INFO_21 *)talloc(p->mem_ctx,sizeof(SAM_USER_INFO_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))
@@ -1586,230 +1692,363 @@ uint32 _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_R_
  samr_reply_query_usergroups
  ********************************************************************/
 
-uint32 _samr_query_usergroups(pipes_struct *p, SAMR_Q_QUERY_USERGROUPS *q_u, SAMR_R_QUERY_USERGROUPS *r_u)
+NTSTATUS _samr_query_usergroups(pipes_struct *p, SAMR_Q_QUERY_USERGROUPS *q_u, SAMR_R_QUERY_USERGROUPS *r_u)
 {
-    struct sam_passwd *sam_pass;
-    DOM_GID *gids = NULL;
-    int num_groups = 0;
-    pstring groups;
-    uint32 rid;
+       SAM_ACCOUNT *sam_pass=NULL;
+       DOM_GID *gids = NULL;
+       int num_groups = 0;
+       uint32 rid;
        struct samr_info *info = NULL;
+       BOOL ret;
 
-    r_u->status = NT_STATUS_NO_PROBLEMO;
+       /*
+        * 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
+        */
 
-    DEBUG(5,("_samr_query_usergroups: %d\n", __LINE__));
+       r_u->status = NT_STATUS_OK;
 
-    /* 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;
+       DEBUG(5,("_samr_query_usergroups: %d\n", __LINE__));
 
-    /* find the user's rid */
-    if ((rid = get_lsa_policy_samr_rid(info)) == 0xffffffff)
-        return NT_STATUS_OBJECT_TYPE_MISMATCH;
+       /* 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;
+
+       if (!sid_check_is_in_our_domain(&info->sid))
+               return NT_STATUS_OBJECT_TYPE_MISMATCH;
+
+       sid_peek_rid(&info->sid, &rid);
 
-    become_root();
-    sam_pass = pdb_getsampwrid(rid);
-    unbecome_root();
+       pdb_init_sam(&sam_pass);
 
-    if (sam_pass == NULL)
-        return NT_STATUS_NO_SUCH_USER;
+       become_root();
+       ret = pdb_getsampwrid(sam_pass, rid);
+       unbecome_root();
 
-       samr_clear_sam_passwd(sam_pass);
+       if (ret == False) {
+               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);
+       /* 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__));
+       DEBUG(5,("_samr_query_usergroups: %d\n", __LINE__));
+       
+       pdb_free_sam(&sam_pass);
 
-    return r_u->status;
+       return r_u->status;
 }
 
 /*******************************************************************
  _samr_query_dom_info
  ********************************************************************/
 
-uint32 _samr_query_dom_info(pipes_struct *p, SAMR_Q_QUERY_DOMAIN_INFO *q_u, SAMR_R_QUERY_DOMAIN_INFO *r_u)
+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;
 
-       if ((ctr = (SAM_UNK_CTR *)talloc(p->mem_ctx, sizeof(SAM_UNK_CTR))) == NULL)
+       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_NO_PROBLEMO;
+       r_u->status = NT_STATUS_OK;
 
-    DEBUG(5,("_samr_query_dom_info: %d\n", __LINE__));
+       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, NULL))
-        return NT_STATUS_INVALID_HANDLE;
+       /* 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:
-            init_unk_info1(&ctr->info.inf1);
-            break;
-        case 0x02:
+       switch (q_u->switch_value) {
+               case 0x01:
+                       account_policy_get(AP_MIN_PASSWORD_LEN, &min_pass_len);
+                       account_policy_get(AP_PASSWORD_HISTORY, &pass_hist);
+                       account_policy_get(AP_USER_MUST_LOGON_TO_CHG_PASS, &flag);
+                       account_policy_get(AP_MAX_PASSWORD_AGE, (int *)&u_expire);
+                       account_policy_get(AP_MIN_PASSWORD_AGE, (int *)&u_min_age);
+
+                       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);
+                       unbecome_root();
+                       if (NT_STATUS_IS_ERR(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, &global_sam_sid);
+                       if (NT_STATUS_IS_ERR(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 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, global_myworkgroup, 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, (int *)&u_lock_duration);
+                       account_policy_get(AP_RESET_COUNT_TIME, (int *)&u_reset_time);
+                       account_policy_get(AP_BAD_ATTEMPT_LOCKOUT, &lockout);
+       
+                       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_NOPROBLEMO);
+       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__));
+       DEBUG(5,("_samr_query_dom_info: %d\n", __LINE__));
 
-    return r_u->status;
+       return r_u->status;
 }
 
 /*******************************************************************
  _api_samr_create_user
+ Create an account, can be either a normal user or a machine.
+ This funcion will need to be updated for bdc/domain trusts.
  ********************************************************************/
 
-uint32 _api_samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_CREATE_USER *r_u)
-{
-    SAM_ACCOUNT *sam_pass;
-    fstring mach_acct;
-    pstring err_str;
-    pstring msg_str;
-    int local_flags=0;
-    DOM_SID sid;
-    pstring add_script;
-    POLICY_HND dom_pol = q_u->domain_pol;
-    UNISTR2 user_account = q_u->uni_name;
-    uint16 acb_info = q_u->acb_info;
-    POLICY_HND *user_pol = &r_u->user_pol;
+NTSTATUS _api_samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_CREATE_USER *r_u)
+{
+       SAM_ACCOUNT *sam_pass=NULL;
+       fstring account;
+       DOM_SID sid;
+       pstring add_script;
+       POLICY_HND dom_pol = q_u->domain_pol;
+       UNISTR2 user_account = q_u->uni_name;
+       uint16 acb_info = q_u->acb_info;
+       POLICY_HND *user_pol = &r_u->user_pol;
        struct samr_info *info = NULL;
+       BOOL ret;
+       NTSTATUS nt_status;
+       struct passwd *pw;
 
-    /* find the policy handle.  open a policy on it. */
-    if (!find_policy_by_hnd(p, &dom_pol, NULL))
-        return NT_STATUS_INVALID_HANDLE;
+       /* find the policy handle.  open a policy on it. */
+       if (!find_policy_by_hnd(p, &dom_pol, NULL))
+               return NT_STATUS_INVALID_HANDLE;
 
-    /* find the machine 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
-       reply if the account already exists...
-     */
-
-    fstrcpy(mach_acct, rpc_unistrn2(user_account.buffer, user_account.uni_str_len, p->endian));
-    strlower(mach_acct);
-
-    become_root();
-    sam_pass = pdb_getsampwnam(mach_acct);
-    unbecome_root();
-    if (sam_pass != NULL) {
-        /* machine account exists: say so */
-        return NT_STATUS_USER_EXISTS;
-    }
+       /* 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
+         reply if the account already exists...
+        */
 
-    local_flags=LOCAL_ADD_USER|LOCAL_DISABLE_USER|LOCAL_SET_NO_PASSWORD;
-    local_flags|= (acb_info & ACB_WSTRUST) ? LOCAL_TRUST_ACCOUNT:0;
-
-    /*
-     * NB. VERY IMPORTANT ! This call must be done as the current pipe user,
-     * *NOT* surrounded by a become_root()/unbecome_root() call. This ensures
-     * that only people with write access to the smbpasswd file will be able
-     * to create a user. JRA.
-     */
-
-    /*
-     * add the user in the /etc/passwd file or the unix authority system.
-     * We don't check if the smb_create_user() function succed or not for 2 reasons:
-     * a) local_password_change() checks for us if the /etc/passwd account really exists
-     * b) smb_create_user() would return an error if the account already exists
-     * and as it could return an error also if it can't create the account, it would be tricky.
-     *
-     * So we go the easy way, only check after if the account exists.
-     * JFM (2/3/2001), to clear any possible bad understanding (-:
-     */
-
-    pstrcpy(add_script, lp_adduser_script());
-
-    if(*add_script)
-        smb_create_user(mach_acct, NULL);
-
-    /* add the user in the smbpasswd file or the Samba authority database */
-    if (!local_password_change(mach_acct, local_flags, NULL, err_str,
-         sizeof(err_str), msg_str, sizeof(msg_str)))
-    {
-        DEBUG(0, ("%s\n", err_str));
-        close_policy_hnd(p, user_pol);
-        return NT_STATUS_ACCESS_DENIED;
-    }
+       rpcstr_pull(account, user_account.buffer, sizeof(account), user_account.uni_str_len*2, 0);
+       strlower(account);
 
-    become_root();
-    sam_pass = pdb_getsampwnam(mach_acct);
-    unbecome_root();
-    if (sam_pass == NULL) {
-        /* account doesn't exist: say so */
-        close_policy_hnd(p, user_pol);
-        return NT_STATUS_ACCESS_DENIED;
-    }
+       pdb_init_sam(&sam_pass);
 
-    /* Get the domain SID stored in the domain policy */
-    if(!get_lsa_policy_samr_sid(p, &dom_pol, &sid)) {
-        close_policy_hnd(p, user_pol);
-        return NT_STATUS_INVALID_HANDLE;
-    }
+       become_root();
+       ret = pdb_getsampwnam(sam_pass, account);
+       unbecome_root();
+       if (ret == True) {
+               /* this account exists: say so */
+               pdb_free_sam(&sam_pass);
+               return NT_STATUS_USER_EXISTS;
+       }
 
-    /* append the user's RID to it */
-    if(!sid_append_rid(&sid, pdb_get_user_rid(sam_pass) )) {
-        close_policy_hnd(p, user_pol);
-        return NT_STATUS_NO_SUCH_USER;
-    }
+       pdb_free_sam(&sam_pass);
 
-    /* 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;
+       /*
+        * NB. VERY IMPORTANT ! This call must be done as the current pipe user,
+        * *NOT* surrounded by a become_root()/unbecome_root() call. This ensures
+        * that only people with write access to the smbpasswd file will be able
+        * to create a user. JRA.
+        */
 
-    ZERO_STRUCTP(info);
-    info->sid = sid;
+       /*
+        * add the user in the /etc/passwd file or the unix authority system.
+        * We don't check if the smb_create_user() function succed or not for 2 reasons:
+        * a) local_password_change() checks for us if the /etc/passwd account really exists
+        * b) smb_create_user() would return an error if the account already exists
+        * and as it could return an error also if it can't create the account, it would be tricky.
+        *
+        * So we go the easy way, only check after if the account exists.
+        * JFM (2/3/2001), to clear any possible bad understanding (-:
+        *
+        * We now have seperate script paramaters for adding users/machines so we
+        * now have some sainity-checking to match. 
+        */
 
-    /* get a (unique) handle.  open a policy on it. */
-    if (!create_policy_hnd(p, user_pol, free_samr_info, (void *)info))
-        return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       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] != '$')) {
+               pstrcpy(add_script, lp_adduser_script());
+       } else {
+               DEBUG(0, ("_api_samr_create_user: mismatch between trust flags and $ termination\n"));
+               pdb_free_sam(&sam_pass);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+#endif
 
-    r_u->user_rid=sam_pass->user_rid;
-    r_u->unknown_0 = 0x000703ff;
+       /* 
+        * 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));
+       }
+       
+       pw = getpwnam_alloc(account);
 
-    return NT_STATUS_NO_PROBLEMO;
-}
+       if (pw) {
+               if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam_pw(&sam_pass, pw))) {
+                       passwd_free(&pw);
+                       return nt_status;
+               }
+               passwd_free(&pw); /* done with this now */
+       } else {
+               DEBUG(3,("attempting to create non-unix account %s\n", account));
+               
+               if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam(&sam_pass))) {
+                       return nt_status;
+               }
+               
+               if (!pdb_set_username(sam_pass, account)) {
+                       pdb_free_sam(&sam_pass);
+                       return NT_STATUS_NO_MEMORY;
+               }
+       }
 
-/*******************************************************************
+       pdb_set_acct_ctrl(sam_pass, acb_info);
+       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;         
+       }
+
+       pdb_reset_sam(sam_pass);
+       
+       if (!pdb_getsampwnam(sam_pass, account)) {
+               pdb_free_sam(&sam_pass);
+               DEBUG(0, ("could not find user/computer %s just added to passdb?!?\n", 
+                         account));
+               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;
+       }
+
+       /* 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;
+       }
+
+       /* associate the user's SID with the new handle. */
+       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;
+
+       /* get a (unique) handle.  open a policy on it. */
+       if (!create_policy_hnd(p, user_pol, free_samr_info, (void *)info)) {
+               pdb_free_sam(&sam_pass);
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       r_u->user_rid=pdb_get_user_rid(sam_pass);
+       r_u->unknown_0 = 0x000703ff;
+
+       pdb_free_sam(&sam_pass);
+
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
  samr_reply_connect_anon
  ********************************************************************/
 
-uint32 _samr_connect_anon(pipes_struct *p, SAMR_Q_CONNECT_ANON *q_u, SAMR_R_CONNECT_ANON *r_u)
+NTSTATUS _samr_connect_anon(pipes_struct *p, SAMR_Q_CONNECT_ANON *q_u, SAMR_R_CONNECT_ANON *r_u)
 {
        struct samr_info *info = NULL;
 
     /* set up the SAMR connect_anon response */
 
-    r_u->status = NT_STATUS_NO_PROBLEMO;
+    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)
+    if ((info = get_samr_info_by_sid(NULL)) == NULL)
         return NT_STATUS_NO_MEMORY;
 
-    ZERO_STRUCTP(info);
     info->status = q_u->unknown_0;
 
     /* get a (unique) handle.  open a policy on it. */
@@ -1823,19 +2062,18 @@ uint32 _samr_connect_anon(pipes_struct *p, SAMR_Q_CONNECT_ANON *q_u, SAMR_R_CONN
  samr_reply_connect
  ********************************************************************/
 
-uint32 _samr_connect(pipes_struct *p, SAMR_Q_CONNECT *q_u, SAMR_R_CONNECT *r_u)
+NTSTATUS _samr_connect(pipes_struct *p, SAMR_Q_CONNECT *q_u, SAMR_R_CONNECT *r_u)
 {
        struct samr_info *info = NULL;
 
     DEBUG(5,("_samr_connect: %d\n", __LINE__));
 
-    r_u->status = NT_STATUS_NO_PROBLEMO;
+    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)
+       if ((info = get_samr_info_by_sid(NULL)) == NULL)
         return NT_STATUS_NO_MEMORY;
 
-    ZERO_STRUCTP(info);
     info->status = q_u->access_mask;
 
     /* get a (unique) handle.  open a policy on it. */
@@ -1851,9 +2089,9 @@ uint32 _samr_connect(pipes_struct *p, SAMR_Q_CONNECT *q_u, SAMR_R_CONNECT *r_u)
  api_samr_lookup_domain
  **********************************************************************/
 
-uint32 _samr_lookup_domain(pipes_struct *p, SAMR_Q_LOOKUP_DOMAIN *q_u, SAMR_R_LOOKUP_DOMAIN *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_NO_PROBLEMO;
+    r_u->status = NT_STATUS_OK;
 
     if (!find_policy_by_hnd(p, &q_u->connect_pol, NULL))
         return NT_STATUS_INVALID_HANDLE;
@@ -1884,8 +2122,8 @@ static BOOL make_enum_domains(TALLOC_CTX *ctx, SAM_ENTRY **pp_sam,
        if (num_sam_entries == 0)
                return True;
 
-       sam = (SAM_ENTRY *)talloc(ctx, sizeof(SAM_ENTRY)*num_sam_entries);
-       uni_name = (UNISTR2 *)talloc(ctx, sizeof(UNISTR2)*num_sam_entries);
+       sam = (SAM_ENTRY *)talloc_zero(ctx, sizeof(SAM_ENTRY)*num_sam_entries);
+       uni_name = (UNISTR2 *)talloc_zero(ctx, sizeof(UNISTR2)*num_sam_entries);
 
        if (sam == NULL || uni_name == NULL)
                return False;
@@ -1907,12 +2145,12 @@ static BOOL make_enum_domains(TALLOC_CTX *ctx, SAM_ENTRY **pp_sam,
  api_samr_enum_domains
  **********************************************************************/
 
-uint32 _samr_enum_domains(pipes_struct *p, SAMR_Q_ENUM_DOMAINS *q_u, SAMR_R_ENUM_DOMAINS *r_u)
+NTSTATUS _samr_enum_domains(pipes_struct *p, SAMR_Q_ENUM_DOMAINS *q_u, SAMR_R_ENUM_DOMAINS *r_u)
 {
        uint32 num_entries = 2;
        fstring dom[2];
 
-       r_u->status = NT_STATUS_NO_PROBLEMO;
+       r_u->status = NT_STATUS_OK;
 
        fstrcpy(dom[0],global_myworkgroup);
        fstrcpy(dom[1],"Builtin");
@@ -1929,7 +2167,7 @@ uint32 _samr_enum_domains(pipes_struct *p, SAMR_Q_ENUM_DOMAINS *q_u, SAMR_R_ENUM
  api_samr_open_alias
  ********************************************************************/
 
-uint32 _api_samr_open_alias(pipes_struct *p, SAMR_Q_OPEN_ALIAS *q_u, SAMR_R_OPEN_ALIAS *r_u)
+NTSTATUS _api_samr_open_alias(pipes_struct *p, SAMR_Q_OPEN_ALIAS *q_u, SAMR_R_OPEN_ALIAS *r_u)
 {
        DOM_SID sid;
        POLICY_HND domain_pol = q_u->dom_pol;
@@ -1937,7 +2175,7 @@ uint32 _api_samr_open_alias(pipes_struct *p, SAMR_Q_OPEN_ALIAS *q_u, SAMR_R_OPEN
        POLICY_HND *alias_pol = &r_u->pol;
        struct samr_info *info = NULL;
 
-       r_u->status = NT_STATUS_NO_PROBLEMO;
+       r_u->status = NT_STATUS_OK;
 
        /* get the domain policy. */
        if (!find_policy_by_hnd(p, &domain_pol, NULL))
@@ -1956,12 +2194,9 @@ uint32 _api_samr_open_alias(pipes_struct *p, SAMR_Q_OPEN_ALIAS *q_u, SAMR_R_OPEN
         * 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;
 
        /* get a (unique) handle.  open a policy on it. */
        if (!create_policy_hnd(p, alias_pol, free_samr_info, (void *)info))
@@ -1976,21 +2211,35 @@ uint32 _api_samr_open_alias(pipes_struct *p, SAMR_Q_OPEN_ALIAS *q_u, SAMR_R_OPEN
 
 static BOOL set_user_info_10(const SAM_USER_INFO_10 *id10, uint32 rid)
 {
-       SAM_ACCOUNT *pwd = pdb_getsampwrid(rid);
+       SAM_ACCOUNT *pwd =NULL;
+       BOOL ret;
+       
+       pdb_init_sam(&pwd);
+       
+       ret = pdb_getsampwrid(pwd, rid);
+       
+       if(ret==False) {
+               pdb_free_sam(&pwd);
+               return False;
+       }
 
        if (id10 == NULL) {
                DEBUG(5, ("set_user_info_10: NULL id10\n"));
+               pdb_free_sam(&pwd);
                return False;
        }
 
-       pwd = pdb_getsampwrid(rid);
-       if (!pwd)
+       if (!pdb_set_acct_ctrl(pwd, id10->acb_info)) {
+               pdb_free_sam(&pwd);
                return False;
+       }
 
-       pdb_set_acct_ctrl(pwd, id10->acb_info);
-
-       if(!pdb_update_sam_account(pwd, True))
+       if(!pdb_update_sam_account(pwd)) {
+               pdb_free_sam(&pwd);
                return False;
+       }
+
+       pdb_free_sam(&pwd);
 
        return True;
 }
@@ -2001,22 +2250,40 @@ static BOOL set_user_info_10(const SAM_USER_INFO_10 *id10, uint32 rid)
 
 static BOOL set_user_info_12(SAM_USER_INFO_12 *id12, uint32 rid)
 {
-       SAM_ACCOUNT *pwd = pdb_getsampwrid(rid);
-       if (pwd == NULL)
+       SAM_ACCOUNT *pwd = NULL;
+
+       pdb_init_sam(&pwd);
+
+       if(!pdb_getsampwrid(pwd, rid)) {
+               pdb_free_sam(&pwd);
                return False;
+       }
+
        if (id12 == NULL) {
                DEBUG(2, ("set_user_info_12: id12 is NULL\n"));
+               pdb_free_sam(&pwd);
                return False;
        }
  
-       pdb_set_lanman_passwd (pwd, id12->lm_pwd);
-       pdb_set_nt_passwd     (pwd, id12->nt_pwd);
-       if(!pdb_update_sam_account(pwd, True))
+       if (!pdb_set_lanman_passwd (pwd, id12->lm_pwd)) {
+               pdb_free_sam(&pwd);
+               return False;
+       }
+       if (!pdb_set_nt_passwd     (pwd, id12->nt_pwd)) {
+               pdb_free_sam(&pwd);
                return False;
+       }
+       if (!pdb_set_pass_changed_now (pwd)) {
+               pdb_free_sam(&pwd);
+               return False; 
+       }
  
+       if(!pdb_update_sam_account(pwd)) {
+               pdb_free_sam(&pwd);
+               return False;
+       }
+
+       pdb_free_sam(&pwd);
        return True;
 }
 
@@ -2026,20 +2293,21 @@ static BOOL set_user_info_12(SAM_USER_INFO_12 *id12, uint32 rid)
 
 static BOOL set_user_info_21(SAM_USER_INFO_21 *id21, uint32 rid)
 {
-       SAM_ACCOUNT *pwd = pdb_getsampwrid(rid);
-       SAM_ACCOUNT new_pwd;
+       SAM_ACCOUNT *pwd = NULL;
  
        if (id21 == NULL) {
                DEBUG(5, ("set_user_info_21: NULL id21\n"));
                return False;
        }
  
-       if (pwd == NULL)
+       pdb_init_sam(&pwd);
+       if (!pdb_getsampwrid(pwd, rid)) {
+               pdb_free_sam(&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
@@ -2049,9 +2317,13 @@ 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);
                return False;
+       }
+
+       pdb_free_sam(&pwd);
+
        return True;
 }
 
@@ -2061,134 +2333,148 @@ static BOOL set_user_info_21(SAM_USER_INFO_21 *id21, uint32 rid)
 
 static BOOL set_user_info_23(SAM_USER_INFO_23 *id23, uint32 rid)
 {
-    SAM_ACCOUNT *pwd = pdb_getsampwrid(rid);
-    SAM_ACCOUNT new_pwd;
-    uint8 nt_hash[16];
-    uint8 lm_hash[16];
-    pstring buf;
-    uint32 len;
+       SAM_ACCOUNT *pwd = NULL;
+       pstring plaintext_buf;
+       uint32 len;
        uint16 acct_ctrl;
  
-    if (id23 == NULL) {
-        DEBUG(5, ("set_user_info_23: NULL id23\n"));
-        return False;
-    }
+       if (id23 == NULL) {
+               DEBUG(5, ("set_user_info_23: NULL id23\n"));
+               return False;
+       }
  
-    if (pwd == NULL)
-        return False;
+       pdb_init_sam(&pwd);
  
+       if (!pdb_getsampwrid(pwd, rid)) {
+               pdb_free_sam(&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);
-    copy_id23_to_sam_passwd(&new_pwd, id23);
-    if (!decode_pw_buffer((char*)id23->pass, buf, 256, &len))
-        return False;
+       copy_id23_to_sam_passwd(pwd, id23);
  
-    nt_lm_owf_gen(buf, nt_hash, lm_hash);
-    pdb_set_lanman_passwd (&new_pwd, lm_hash);
-    pdb_set_nt_passwd     (&new_pwd, nt_hash);
+       if (!decode_pw_buffer((char*)id23->pass, plaintext_buf, 256, &len)) {
+               pdb_free_sam(&pwd);
+               return False;
+       }
+  
+       if (!pdb_set_plaintext_passwd (pwd, plaintext_buf)) {
+               pdb_free_sam(&pwd);
+               return False;
+       }
  
        /* 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 ( (!IS_SAM_UNIX_USER(pwd)) ||
+               ( (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 */
                /* update the UNIX password */
                if (lp_unix_password_sync() )
-                       if(!chgpasswd(pdb_get_username(&new_pwd), "", buf, True))
+                       if(!chgpasswd(pdb_get_username(pwd), "", plaintext_buf, True)) {
+                               pdb_free_sam(&pwd);
                                return False;
+                       }
        }
  
-    memset(buf, 0, sizeof(buf));
+       ZERO_STRUCT(plaintext_buf);
  
-    if(!pdb_update_sam_account(&new_pwd, True))
-        return False;
+       if(!pdb_update_sam_account(pwd)) {
+               pdb_free_sam(&pwd);
+               return False;
+       }
  
-    return True;
+       pdb_free_sam(&pwd);
+
+       return True;
 }
 
 /*******************************************************************
- set_user_info_24
+ set_user_info_pw
  ********************************************************************/
 
-static BOOL set_user_info_24(SAM_USER_INFO_24 *id24, uint32 rid)
+static BOOL set_user_info_pw(char *pass, uint32 rid)
 {
-       SAM_ACCOUNT *pwd = pdb_getsampwrid(rid);
-       uchar nt_hash[16];
-       uchar lm_hash[16];
+       SAM_ACCOUNT *pwd = NULL;
        uint32 len;
-       pstring buf;
+       pstring plaintext_buf;
        uint16 acct_ctrl;
  
-       if (pwd == NULL)
-               return False;
+       pdb_init_sam(&pwd);
  
+       if (!pdb_getsampwrid(pwd, rid)) {
+               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);
 
-       memset(buf, 0, sizeof(buf));
+       ZERO_STRUCT(plaintext_buf);
  
-       if (!decode_pw_buffer((char*)id24->pass, buf, 256, &len))
+       if (!decode_pw_buffer(pass, plaintext_buf, 256, &len)) {
+               pdb_free_sam(&pwd);
                return False;
-       DEBUG(5,("set_user_info_24:nt_lm_owf_gen\n"));
-       nt_lm_owf_gen(buf, nt_hash, lm_hash);
-       pdb_set_lanman_passwd (pwd, lm_hash);
-       pdb_set_nt_passwd     (pwd, nt_hash);
+       }
+
+       if (!pdb_set_plaintext_passwd (pwd, plaintext_buf)) {
+               pdb_free_sam(&pwd);
+               return False;
+       }
  
        /* 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 ( (!IS_SAM_UNIX_USER(pwd)) ||
+               ( (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(pwd), "", buf, True))
+               if (lp_unix_password_sync()) {
+                       if(!chgpasswd(pdb_get_username(pwd), "", plaintext_buf, True)) {
+                               pdb_free_sam(&pwd);
                                return False;
+                       }
+               }
        }
  
-    memset(buf, 0, sizeof(buf));
-    DEBUG(0,("set_user_info_24: pdb_update_sam_account()\n"));
+       ZERO_STRUCT(plaintext_buf);
  
-    /* update the SAMBA password */
-    if(!pdb_update_sam_account(pwd, True))
-        return False;
+       DEBUG(5,("set_user_info_pw: pdb_update_pwd()\n"));
  
-    return True;
+       /* update the SAMBA password */
+       if(!pdb_update_sam_account(pwd)) {
+               pdb_free_sam(&pwd);
+               return False;
+       }
+
+       pdb_free_sam(&pwd);
+
+       return True;
 }
 
 /*******************************************************************
  samr_reply_set_userinfo
  ********************************************************************/
 
-uint32 _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SET_USERINFO *r_u)
+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;
-       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;
 
        DEBUG(5, ("_samr_set_userinfo: %d\n", __LINE__));
 
-       r_u->status = NT_STATUS_NOPROBLEMO;
-
-       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));
-       }
+       r_u->status = NT_STATUS_OK;
 
        /* find the policy handle.  open a policy on it. */
        if (!get_lsa_policy_samr_sid(p, pol, &sid))
@@ -2203,24 +2489,6 @@ uint32 _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SET_
                return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-
-       /* 
-        * 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();
-       sam_pass = pdb_getsampwuid(user.uid);
-       unbecome_root();
-       if(sam_pass == NULL) {
-               DEBUG(0,("_samr_set_userinfo: Unable to get smbpasswd entry for uid %u\n", (unsigned int)user.uid ));
-               return NT_STATUS_ACCESS_DENIED;
-       }
-               
-       memset(sess_key, '\0', 16);
-       mdfour(sess_key, pdb_get_nt_passwd(sam_pass), 16);
-
        /* ok!  user info levels (lots: see MSDEV help), off we go... */
        switch (switch_value) {
                case 0x12:
@@ -2229,13 +2497,39 @@ uint32 _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SET_
                        break;
 
                case 24:
-                       SamOEMhash(ctr->info.id24->pass, sess_key, 1);
-                       if (!set_user_info_24(ctr->info.id24, rid))
+                       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))
+                               return NT_STATUS_ACCESS_DENIED;
+                       break;
+
+               case 25:
+#if 0
+                       /*
+                        * Currently we don't really know how to unmarshall
+                        * the level 25 struct, and the password encryption
+                        * is different. This is a placeholder for when we
+                        * do understand it. In the meantime just return INVALID
+                        * info level and W2K SP2 drops down to level 23... JRA.
+                        */
+
+                       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))
                                return NT_STATUS_ACCESS_DENIED;
                        break;
+#endif
+                       return NT_STATUS_INVALID_INFO_CLASS;
 
                case 23:
-                       SamOEMhash(ctr->info.id23->pass, sess_key, 1);
+                       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))
                                return NT_STATUS_ACCESS_DENIED;
                        break;
@@ -2251,7 +2545,7 @@ uint32 _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SET_
  samr_reply_set_userinfo2
  ********************************************************************/
 
-uint32 _samr_set_userinfo2(pipes_struct *p, SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_SET_USERINFO2 *r_u)
+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;
@@ -2261,7 +2555,7 @@ uint32 _samr_set_userinfo2(pipes_struct *p, SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_SE
 
        DEBUG(5, ("samr_reply_set_userinfo2: %d\n", __LINE__));
 
-       r_u->status = NT_STATUS_NOPROBLEMO;
+       r_u->status = NT_STATUS_OK;
 
        /* find the policy handle.  open a policy on it. */
        if (!get_lsa_policy_samr_sid(p, pol, &sid))
@@ -2304,168 +2598,1088 @@ uint32 _samr_set_userinfo2(pipes_struct *p, SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_SE
  _samr_query_aliasmem
 *********************************************************************/
 
-uint32 _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES *q_u, SAMR_R_QUERY_USERALIASES *r_u)
+NTSTATUS _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES *q_u, SAMR_R_QUERY_USERALIASES *r_u)
 {
-  DEBUG(0,("_samr_query_useraliases: Not yet implemented.\n"));
-  return False;
+       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;
+       /* 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
+        */
+       
+       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;
+
+       if (!sid_check_is_domain(&info->sid) &&
+           !sid_check_is_builtin(&info->sid))
+               return NT_STATUS_OBJECT_TYPE_MISMATCH;
+
+
+       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_ERR(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;
 }
 
 /*********************************************************************
  _samr_query_aliasmem
 *********************************************************************/
 
-uint32 _samr_query_aliasmem(pipes_struct *p, SAMR_Q_QUERY_ALIASMEM *q_u, SAMR_R_QUERY_ALIASMEM *r_u)
+NTSTATUS _samr_query_aliasmem(pipes_struct *p, SAMR_Q_QUERY_ALIASMEM *q_u, SAMR_R_QUERY_ALIASMEM *r_u)
 {
-  DEBUG(0,("_samr_query_aliasmem: Not yet implemented.\n"));
-  return False;
+       int i;
+
+       GROUP_MAP map;
+       int num_uids = 0;
+       DOM_SID2 *sid;
+       uid_t *uid=NULL;
+
+       DOM_SID alias_sid;
+       DOM_SID als_sid;
+       uint32 alias_rid;
+       fstring alias_sid_str;
+       DOM_SID temp_sid;
+
+
+       /* find the policy handle.  open a policy on it. */
+       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       sid_copy(&als_sid, &alias_sid);
+       sid_to_string(alias_sid_str, &alias_sid);
+       sid_split_rid(&alias_sid, &alias_rid);
+
+       DEBUG(10, ("sid is %s\n", alias_sid_str));
+
+       if (sid_equal(&alias_sid, &global_sid_Builtin)) {
+               DEBUG(10, ("lookup on Builtin SID (S-1-5-32)\n"));
+               if(!get_local_group_from_sid(als_sid, &map, MAPPING_WITHOUT_PRIV))
+                       return NT_STATUS_NO_SUCH_ALIAS;
+       } else {
+               if (sid_equal(&alias_sid, &global_sam_sid)) {
+                       DEBUG(10, ("lookup on Server SID\n"));
+                       if(!get_local_group_from_sid(als_sid, &map, MAPPING_WITHOUT_PRIV))
+                               return NT_STATUS_NO_SUCH_ALIAS;
+               }
+       }
+
+       if(!get_uid_list_of_group(map.gid, &uid, &num_uids))
+               return NT_STATUS_NO_SUCH_ALIAS;
+
+       DEBUG(10, ("sid is %s\n", alias_sid_str));
+       sid = (DOM_SID2 *)talloc_zero(p->mem_ctx, sizeof(DOM_SID2) * num_uids); 
+       if (num_uids!=0 && sid == NULL) 
+               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]));
+               
+               init_dom_sid2(&sid[i], &temp_sid);
+       }
+
+       DEBUG(10, ("sid is %s\n", alias_sid_str));
+       init_samr_r_query_aliasmem(r_u, num_uids, sid, NT_STATUS_OK);
+
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
  _samr_query_groupmem
 *********************************************************************/
 
-uint32 _samr_query_groupmem(pipes_struct *p, SAMR_Q_QUERY_GROUPMEM *q_u, SAMR_R_QUERY_GROUPMEM *r_u)
+NTSTATUS _samr_query_groupmem(pipes_struct *p, SAMR_Q_QUERY_GROUPMEM *q_u, SAMR_R_QUERY_GROUPMEM *r_u)
 {
-  DEBUG(0,("_samr_query_groupmem: Not yet implemented.\n"));
-  return False;
+       int num_uids = 0;
+       int i;
+       DOM_SID group_sid;
+       uint32 group_rid;
+       fstring group_sid_str;
+       uid_t *uid=NULL;
+       
+       GROUP_MAP map;
+
+       uint32 *rid=NULL;
+       uint32 *attr=NULL;
+
+
+       /* find the policy handle.  open a policy on it. */
+       if (!get_lsa_policy_samr_sid(p, &q_u->group_pol, &group_sid)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       /* todo: change to use sid_compare_front */
+
+       sid_split_rid(&group_sid, &group_rid);
+       sid_to_string(group_sid_str, &group_sid);
+       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))
+               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, MAPPING_WITHOUT_PRIV))
+               return NT_STATUS_NO_SUCH_GROUP;
+
+       if(!get_uid_list_of_group(map.gid, &uid, &num_uids))
+               return NT_STATUS_NO_SUCH_GROUP;
+
+       rid=talloc_zero(p->mem_ctx, sizeof(uint32)*num_uids);
+       attr=talloc_zero(p->mem_ctx, sizeof(uint32)*num_uids);
+       
+       if (num_uids!=0 && (rid==NULL || attr==NULL))
+               return NT_STATUS_NO_MEMORY;
+       
+       for (i=0; i<num_uids; i++) {
+               rid[i]=pdb_uid_to_user_rid(uid[i]);
+               attr[i] = SID_NAME_USER;                
+       }
+
+       init_samr_r_query_groupmem(r_u, num_uids, rid, attr, NT_STATUS_OK);
+
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
  _samr_add_aliasmem
 *********************************************************************/
 
-uint32 _samr_add_aliasmem(pipes_struct *p, SAMR_Q_ADD_ALIASMEM *q_u, SAMR_R_ADD_ALIASMEM *r_u)
+NTSTATUS _samr_add_aliasmem(pipes_struct *p, SAMR_Q_ADD_ALIASMEM *q_u, SAMR_R_ADD_ALIASMEM *r_u)
 {
-  DEBUG(0,("_samr_add_aliasmem: Not yet implemented.\n"));
-  return False;
+       DOM_SID alias_sid;
+       fstring alias_sid_str;
+       uid_t uid;
+       struct passwd *pwd;
+       struct group *grp;
+       fstring grp_name;
+       uint32 rid;
+       GROUP_MAP map;
+
+       /* Find the policy handle. Open a policy on it. */
+       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       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) {
+               DEBUG(10, ("adding member on Server SID\n"));
+               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_local_group_from_sid(alias_sid, &map, MAPPING_WITHOUT_PRIV))
+                               return NT_STATUS_NO_SUCH_ALIAS;
+
+               } else
+                       return NT_STATUS_NO_SUCH_ALIAS;
+       }
+
+       sid_split_rid(&q_u->sid.sid, &rid);
+       uid=pdb_user_rid_to_uid(rid);
+
+       if ((pwd=getpwuid(uid)) == NULL)
+               return NT_STATUS_NO_SUCH_USER;
+
+       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_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))
+               return NT_STATUS_MEMBER_IN_ALIAS;
+
+       /* 
+        * ok, the group exist, the user exist, the user is not in the group,
+        * we can (finally) add it to the group !
+        */
+       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))
+               return NT_STATUS_MEMBER_NOT_IN_ALIAS;   /* don't know what to reply else */
+
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
  _samr_del_aliasmem
 *********************************************************************/
 
-uint32 _samr_del_aliasmem(pipes_struct *p, SAMR_Q_DEL_ALIASMEM *q_u, SAMR_R_DEL_ALIASMEM *r_u)
+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 False;
+       DOM_SID alias_sid;
+       fstring alias_sid_str;
+       struct group *grp;
+       fstring grp_name;
+       uint32 rid;
+       GROUP_MAP map;
+       SAM_ACCOUNT *sam_pass=NULL;
+
+       /* Find the policy handle. Open a policy on it. */
+       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       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_group_list */
+       fstrcpy(grp_name, grp->gr_name);
+
+       sid_peek_rid(&q_u->sid.sid, &rid);
+
+       /* check if the user exists before trying to remove it from the group */
+       pdb_init_sam(&sam_pass);
+       if(!pdb_getsampwrid(sam_pass, rid)) {
+               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_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_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;
 }
 
 /*********************************************************************
  _samr_add_groupmem
 *********************************************************************/
 
-uint32 _samr_add_groupmem(pipes_struct *p, SAMR_Q_ADD_GROUPMEM *q_u, SAMR_R_ADD_GROUPMEM *r_u)
+NTSTATUS _samr_add_groupmem(pipes_struct *p, SAMR_Q_ADD_GROUPMEM *q_u, SAMR_R_ADD_GROUPMEM *r_u)
 {
-  DEBUG(0,("_samr_add_groupmem: Not yet implemented.\n"));
-  return False;
+       DOM_SID group_sid;
+       fstring group_sid_str;
+       struct passwd *pwd;
+       struct group *grp;
+       fstring grp_name;
+       GROUP_MAP map;
+
+       /* Find the policy handle. Open a policy on it. */
+       if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       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)
+               return NT_STATUS_NO_SUCH_GROUP;
+
+       DEBUG(10, ("lookup on Domain SID\n"));
+
+       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;
+
+       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);
+
+       /* if the user is already in the group */
+       if(user_in_group_list(pwd->pw_name, grp_name))
+               return NT_STATUS_MEMBER_IN_GROUP;
+
+       /* 
+        * ok, the group exist, the user exist, the user is not in the group,
+        *
+        * we can (finally) add it to the group !
+        */
+
+       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))
+               return NT_STATUS_MEMBER_NOT_IN_GROUP;           /* don't know what to reply else */
+
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
  _samr_del_groupmem
 *********************************************************************/
 
-uint32 _samr_del_groupmem(pipes_struct *p, SAMR_Q_DEL_GROUPMEM *q_u, SAMR_R_DEL_GROUPMEM *r_u)
+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 False;
+       DOM_SID group_sid;
+       SAM_ACCOUNT *sam_pass=NULL;
+       uint32 rid;
+       GROUP_MAP map;
+       fstring grp_name;
+       struct group *grp;
+
+       /*
+        * 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)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       if(!sid_check_is_in_our_domain(&group_sid))
+               return NT_STATUS_NO_SUCH_GROUP;
+
+       rid=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_getsampwrid(sam_pass, rid)) {
+               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_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_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;
+
 }
 
 /*********************************************************************
  _samr_delete_dom_user
 *********************************************************************/
 
-uint32 _samr_delete_dom_user(pipes_struct *p, SAMR_Q_DELETE_DOM_USER *q_u, SAMR_R_DELETE_DOM_USER *r_u )
+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 False;
+       DOM_SID user_sid;
+       SAM_ACCOUNT *sam_pass=NULL;
+       uint32 rid;
+
+       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)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       if (!sid_check_is_in_our_domain(&user_sid))
+               return NT_STATUS_CANNOT_DELETE;
+
+       sid_peek_rid(&user_sid, &rid);
+
+       /* check if the user exists before trying to delete */
+       pdb_init_sam(&sam_pass);
+       if(!pdb_getsampwrid(sam_pass, rid)) {
+               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;
 }
 
 /*********************************************************************
  _samr_delete_dom_group
 *********************************************************************/
 
-uint32 _samr_delete_dom_group(pipes_struct *p, SAMR_Q_DELETE_DOM_GROUP *q_u, SAMR_R_DELETE_DOM_GROUP *r_u)
+NTSTATUS _samr_delete_dom_group(pipes_struct *p, SAMR_Q_DELETE_DOM_GROUP *q_u, SAMR_R_DELETE_DOM_GROUP *r_u)
 {
-  DEBUG(0,("_samr_delete_dom_group: Not yet implemented.\n"));
-  return False;
+       DOM_SID group_sid;
+       DOM_SID dom_sid;
+       uint32 group_rid;
+       fstring group_sid_str;
+       gid_t gid;
+       struct group *grp;
+       GROUP_MAP map;
+
+       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)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       sid_copy(&dom_sid, &group_sid);
+       sid_to_string(group_sid_str, &dom_sid);
+       sid_split_rid(&dom_sid, &group_rid);
+
+       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))
+               return NT_STATUS_NO_SUCH_GROUP;
+
+       DEBUG(10, ("lookup on Domain SID\n"));
+
+       if(!get_domain_group_from_sid(group_sid, &map, MAPPING_WITHOUT_PRIV))
+               return NT_STATUS_NO_SUCH_GROUP;
+
+       gid=map.gid;
+
+       /* check if group really exists */
+       if ( (grp=getgrgid(gid)) == NULL)
+               return NT_STATUS_NO_SUCH_GROUP;
+
+       /* we can delete the UNIX group */
+       smb_delete_group(grp->gr_name);
+
+       /* check if the group has been successfully deleted */
+       if ( (grp=getgrgid(gid)) != NULL)
+               return NT_STATUS_ACCESS_DENIED;
+
+       if(!group_map_remove(group_sid))
+               return NT_STATUS_ACCESS_DENIED;
+
+       if (!close_policy_hnd(p, &q_u->group_pol))
+               return NT_STATUS_OBJECT_NAME_INVALID;
+
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
  _samr_delete_dom_alias
 *********************************************************************/
 
-uint32 _samr_delete_dom_alias(pipes_struct *p, SAMR_Q_DELETE_DOM_ALIAS *q_u, SAMR_R_DELETE_DOM_ALIAS *r_u)
+NTSTATUS _samr_delete_dom_alias(pipes_struct *p, SAMR_Q_DELETE_DOM_ALIAS *q_u, SAMR_R_DELETE_DOM_ALIAS *r_u)
 {
-  DEBUG(0,("_samr_delete_dom_alias: Not yet implemented.\n"));
-  return False;
+       DOM_SID alias_sid;
+       DOM_SID dom_sid;
+       uint32 alias_rid;
+       fstring alias_sid_str;
+       gid_t gid;
+       struct group *grp;
+       GROUP_MAP map;
+
+       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)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       sid_copy(&dom_sid, &alias_sid);
+       sid_to_string(alias_sid_str, &dom_sid);
+       sid_split_rid(&dom_sid, &alias_rid);
+
+       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))
+               return NT_STATUS_NO_SUCH_ALIAS;
+
+       DEBUG(10, ("lookup on Local SID\n"));
+
+       if(!get_local_group_from_sid(alias_sid, &map, MAPPING_WITHOUT_PRIV))
+               return NT_STATUS_NO_SUCH_ALIAS;
+
+       gid=map.gid;
+
+       /* check if group really exists */
+       if ( (grp=getgrgid(gid)) == NULL)
+               return NT_STATUS_NO_SUCH_ALIAS;
+
+       /* we can delete the UNIX group */
+       smb_delete_group(grp->gr_name);
+
+       /* check if the group has been successfully deleted */
+       if ( (grp=getgrgid(gid)) != NULL)
+               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);
+
+       if (!close_policy_hnd(p, &q_u->alias_pol))
+               return NT_STATUS_OBJECT_NAME_INVALID;
+
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
  _samr_create_dom_group
 *********************************************************************/
 
-uint32 _samr_create_dom_group(pipes_struct *p, SAMR_Q_CREATE_DOM_GROUP *q_u, SAMR_R_CREATE_DOM_GROUP *r_u)
+NTSTATUS _samr_create_dom_group(pipes_struct *p, SAMR_Q_CREATE_DOM_GROUP *q_u, SAMR_R_CREATE_DOM_GROUP *r_u)
 {
-  DEBUG(0,("_samr_create_dom_group: Not yet implemented.\n"));
-  return False;
+       DOM_SID dom_sid;
+       DOM_SID info_sid;
+       fstring name;
+       fstring sid_string;
+       struct group *grp;
+       struct samr_info *info;
+       PRIVILEGE_SET priv_set;
+
+       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)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       if (!sid_equal(&dom_sid, &global_sam_sid))
+               return NT_STATUS_ACCESS_DENIED;
+
+       /* TODO: check if allowed to create group and add a become_root/unbecome_root pair.*/
+
+       unistr2_to_ascii(name, &q_u->uni_acct_desc, sizeof(name)-1);
+
+       /* check if group already exist */
+       if ((grp=getgrnam(name)) != NULL)
+               return NT_STATUS_GROUP_EXISTS;
+
+       /* we can create the UNIX group */
+       smb_create_group(name);
+
+       /* check if the group has been successfully created */
+       if ((grp=getgrnam(name)) == NULL)
+               return NT_STATUS_ACCESS_DENIED;
+
+       r_u->rid=pdb_gid_to_group_rid(grp->gr_gid);
+
+       /* add the group to the mapping table */
+       sid_copy(&info_sid, &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 = 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->pol, free_samr_info, (void *)info))
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
  _samr_create_dom_alias
 *********************************************************************/
 
-uint32 _samr_create_dom_alias(pipes_struct *p, SAMR_Q_CREATE_DOM_ALIAS *q_u, SAMR_R_CREATE_DOM_ALIAS *r_u)
+NTSTATUS _samr_create_dom_alias(pipes_struct *p, SAMR_Q_CREATE_DOM_ALIAS *q_u, SAMR_R_CREATE_DOM_ALIAS *r_u)
 {
-  DEBUG(0,("_samr_create_dom_alias: Not yet implemented.\n"));
-  return False;
+       DOM_SID dom_sid;
+       DOM_SID info_sid;
+       fstring name;
+       fstring sid_string;
+       struct group *grp;
+       struct samr_info *info;
+       PRIVILEGE_SET priv_set;
+
+       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)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       if (!sid_equal(&dom_sid, &global_sam_sid))
+               return NT_STATUS_ACCESS_DENIED;
+
+       /* TODO: check if allowed to create group  and add a become_root/unbecome_root pair.*/
+
+       unistr2_to_ascii(name, &q_u->uni_acct_desc, sizeof(name)-1);
+
+       /* check if group already exists */
+       if ( (grp=getgrnam(name)) != NULL)
+               return NT_STATUS_GROUP_EXISTS;
+
+       /* we can create the UNIX group */
+       smb_create_group(name);
+
+       /* check if the group has been successfully created */
+       if ((grp=getgrnam(name)) == NULL)
+               return NT_STATUS_ACCESS_DENIED;
+
+       r_u->rid=pdb_gid_to_group_rid(grp->gr_gid);
+
+       sid_copy(&info_sid, &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, 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;
+
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
  _samr_query_groupinfo
+
+sends the name/comment pair of a domain group
+level 1 send also the number of users of that group
+*********************************************************************/
+
+NTSTATUS _samr_query_groupinfo(pipes_struct *p, SAMR_Q_QUERY_GROUPINFO *q_u, SAMR_R_QUERY_GROUPINFO *r_u)
+{
+       DOM_SID group_sid;
+       GROUP_MAP map;
+       uid_t *uid=NULL;
+       int num_uids=0;
+       GROUP_INFO_CTR *ctr;
+
+       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, 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;
+
+       switch (q_u->switch_level) {
+               case 1:
+                       ctr->switch_value1 = 1;
+                       if(!get_uid_list_of_group(map.gid, &uid, &num_uids))
+                               return NT_STATUS_NO_SUCH_GROUP;
+                       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);
+                       break;
+               default:
+                       return NT_STATUS_INVALID_INFO_CLASS;
+       }
+
+       init_samr_r_query_groupinfo(r_u, ctr, NT_STATUS_OK);
+
+       return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ _samr_set_groupinfo
+ update a domain group's comment.
 *********************************************************************/
 
-uint32 _samr_query_groupinfo(pipes_struct *p, SAMR_Q_QUERY_GROUPINFO *q_u, SAMR_R_QUERY_GROUPINFO *r_u)
+NTSTATUS _samr_set_groupinfo(pipes_struct *p, SAMR_Q_SET_GROUPINFO *q_u, SAMR_R_SET_GROUPINFO *r_u)
 {
-  DEBUG(0,("_samr_query_groupinfo: Not yet implemented.\n"));
-  return False;
+       DOM_SID group_sid;
+       GROUP_MAP map;
+       GROUP_INFO_CTR *ctr;
+
+       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, MAPPING_WITH_PRIV))
+               return NT_STATUS_NO_SUCH_GROUP;
+       
+       ctr=q_u->ctr;
+
+       switch (ctr->switch_value1) {
+               case 1:
+                       unistr2_to_ascii(map.comment, &(ctr->group.info1.uni_acct_desc), sizeof(map.comment)-1);
+                       break;
+               case 4:
+                       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)) {
+               free_privilege(&map.priv_set);
+               return NT_STATUS_NO_SUCH_GROUP;
+       }
+
+       free_privilege(&map.priv_set);
+
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
  _samr_set_groupinfo
+ update a domain group's comment.
 *********************************************************************/
 
-uint32 _samr_set_groupinfo(pipes_struct *p, SAMR_Q_SET_GROUPINFO *q_u, SAMR_R_SET_GROUPINFO *r_u)
+NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_SET_ALIASINFO *r_u)
 {
-  DEBUG(0,("_samr_set_groupinfo: Not yet implemented.\n"));
-  return False;
+       DOM_SID group_sid;
+       GROUP_MAP map;
+       ALIAS_INFO_CTR *ctr;
+
+       if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &group_sid)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       if (!get_local_group_from_sid(group_sid, &map, MAPPING_WITH_PRIV))
+               return NT_STATUS_NO_SUCH_GROUP;
+       
+       ctr=&q_u->ctr;
+
+       switch (ctr->switch_value1) {
+               case 3:
+                       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)) {
+               free_privilege(&map.priv_set);
+               return NT_STATUS_NO_SUCH_GROUP;
+       }
+
+       free_privilege(&map.priv_set);
+
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
  _samr_get_dom_pwinfo
 *********************************************************************/
 
-uint32 _samr_get_dom_pwinfo(pipes_struct *p, SAMR_Q_GET_DOM_PWINFO *q_u, SAMR_R_GET_DOM_PWINFO *r_u)
+NTSTATUS _samr_get_dom_pwinfo(pipes_struct *p, SAMR_Q_GET_DOM_PWINFO *q_u, SAMR_R_GET_DOM_PWINFO *r_u)
 {
        /* Actually, returning zeros here works quite well :-). */
-       return NT_STATUS_NOPROBLEMO;
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
  _samr_open_group
 *********************************************************************/
 
-uint32 _samr_open_group(pipes_struct *p, SAMR_Q_OPEN_GROUP *q_u, SAMR_R_OPEN_GROUP *r_u)
+NTSTATUS _samr_open_group(pipes_struct *p, SAMR_Q_OPEN_GROUP *q_u, SAMR_R_OPEN_GROUP *r_u)
 {
-  DEBUG(0,("_samr_open_group: Not yet implemented.\n"));
-  return False;
+       DOM_SID sid;
+       DOM_SID info_sid;
+       GROUP_MAP map;
+       struct samr_info *info;
+       fstring sid_string;
+
+       if (!get_lsa_policy_samr_sid(p, &q_u->domain_pol, &sid)) 
+               return NT_STATUS_INVALID_HANDLE;
+
+       /* this should not be hard-coded like this */
+       if (!sid_equal(&sid, &global_sam_sid))
+               return NT_STATUS_ACCESS_DENIED;
+
+       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;
+
+       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, 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))
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+       return NT_STATUS_OK;
 }
 
 /*********************************************************************
  _samr_unknown_2d
 *********************************************************************/
 
-uint32 _samr_unknown_2d(pipes_struct *p, SAMR_Q_UNKNOWN_2D *q_u, SAMR_R_UNKNOWN_2D *r_u)
+NTSTATUS _samr_unknown_2d(pipes_struct *p, SAMR_Q_UNKNOWN_2D *q_u, SAMR_R_UNKNOWN_2D *r_u)
+{
+       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;
+
+       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, &min_pass_len);
+                       account_policy_get(AP_PASSWORD_HISTORY, &pass_hist);
+                       account_policy_get(AP_USER_MUST_LOGON_TO_CHG_PASS, &flag);
+                       account_policy_get(AP_MAX_PASSWORD_AGE, (int *)&u_expire);
+                       account_policy_get(AP_MIN_PASSWORD_AGE, (int *)&u_min_age);
+
+                       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);
+                       unbecome_root();
+                       if (NT_STATUS_IS_ERR(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, &global_sam_sid);
+                       if (NT_STATUS_IS_ERR(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), 
+                                      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, (int *)&u_lock_duration);
+                       account_policy_get(AP_RESET_COUNT_TIME, (int *)&u_reset_time);
+                       account_policy_get(AP_BAD_ATTEMPT_LOCKOUT, &lockout);
+       
+                       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)
 {
-  DEBUG(0,("_samr_unknown_2d: Not yet implemented.\n"));
-  return False;
+       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;
 }
+