Removed save directory argument to become_root() calls. Probably most of
[samba.git] / source3 / rpc_server / srv_samr.c
index b0742d0e341b8775c21d1782615815cdba08fd9f..50fe613e49d131b754ccff54ff53022490fcb090 100644 (file)
@@ -1,4 +1,4 @@
-
+#define OLD_NTDOMAIN 1
 /* 
  *  Unix SMB/Netbios implementation.
  *  Version 1.9.
@@ -6,6 +6,7 @@
  *  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.
  *  
  *  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
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 
-extern BOOL sam_logon_in_ssb;
-extern pstring samlogon_user;
-extern DOM_SID global_machine_sid;
+extern fstring global_myworkgroup;
+extern pstring global_myname;
+extern DOM_SID global_sam_sid;
 
 extern rid_name domain_group_rids[];
 extern rid_name domain_alias_rids[];
+extern rid_name builtin_alias_rids[];
 
 /*******************************************************************
   This next function should be replaced with something that
@@ -41,12 +41,13 @@ extern rid_name domain_alias_rids[];
  ********************************************************************/
 
 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)
 {
        void *vp = NULL;
-       struct smb_passwd *pwd = NULL;
+       struct sam_passwd *pwd = NULL;
 
        (*num_entries) = 0;
        (*total_entries) = 0;
@@ -54,39 +55,43 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
        if (pw_buf == NULL) return False;
 
        vp = startsmbpwent(False);
-       if (!vp)
-       {
+       if (!vp) {
                DEBUG(0, ("get_sampwd_entries: Unable to open SMB password database.\n"));
                return False;
        }
 
-       while (((pwd = getsmbpwent(vp)) != NULL) && (*num_entries) < max_num_entries)
-       {
-               int user_name_len = strlen(pwd->smb_name);
-               make_unistr2(&(pw_buf[(*num_entries)].uni_user_name), pwd->smb_name, user_name_len-1);
-               make_uni_hdr(&(pw_buf[(*num_entries)].hdr_user_name), user_name_len-1, 
-                              user_name_len-1, 1);
-               pw_buf[(*num_entries)].user_rid = pwd->smb_userid;
-               bzero( pw_buf[(*num_entries)].nt_pwd , 16);
+       while (((pwd = getsam21pwent(vp)) != 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(pwd->smb_name);
+               init_unistr2(&(pw_buf[(*num_entries)].uni_user_name), pwd->smb_name, 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 (pwd->smb_nt_passwd != NULL)
-               {
+               if (pwd->smb_nt_passwd != NULL) {
                        memcpy( pw_buf[(*num_entries)].nt_pwd , pwd->smb_nt_passwd, 16);
                }
 
                pw_buf[(*num_entries)].acb_info = (uint16)pwd->acct_ctrl;
 
-               DEBUG(5, ("get_smbpwd_entries: idx: %d user %s, uid %d, acb %x",
-               (*num_entries), pwd->smb_name, pwd->smb_userid, pwd->acct_ctrl));
+               DEBUG(5, ("entry idx: %d user %s, rid 0x%x, acb %x",
+                         (*num_entries), pwd->smb_name,
+                         pwd->user_rid, pwd->acct_ctrl));
 
-               if (acb_mask == 0 || IS_BITS_SET_SOME(pwd->acct_ctrl, acb_mask))
-               {
+               if (acb_mask == 0 || IS_BITS_SET_SOME(pwd->acct_ctrl, acb_mask)) {
                        DEBUG(5,(" acb_mask %x accepts\n", acb_mask));
                        (*num_entries)++;
-               }
-               else
-               {
+               } else {
                        DEBUG(5,(" acb_mask %x rejects\n", acb_mask));
                }
 
@@ -98,16 +103,243 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
        return (*num_entries) > 0;
 }
 
+/*******************************************************************
+ This function uses the username map file and tries to map a UNIX
+ user name to an DOS name.  (Sort of the reverse of the
+ map_username() function.)  Since more than one DOS name can map
+ to the UNIX name, to reverse the mapping you have to specify
+ which corresponding DOS name you want; that's where the name_idx
+ parameter comes in.  Returns the string requested or NULL if it
+ fails or can't complete the request for any reason.  This doesn't
+ handle group names (starting with '@') or names starting with
+ '+' or '&'.  If they are encountered, they are skipped.
+********************************************************************/
+
+static char *unmap_unixname(char *unix_user_name, int name_idx)
+{
+       char *mapfile = lp_username_map();
+       char **lines;
+       static pstring tok;
+       int i;
+
+       if (!*unix_user_name) return NULL;
+       if (!*mapfile) return NULL;
+
+       lines = file_lines_load(mapfile, NULL);
+       if (!lines) {
+               DEBUG(0,("unmap_unixname: can't open username map %s\n", mapfile));
+               return NULL;
+       }
+
+       DEBUG(5,("unmap_unixname: scanning username map %s, index: %d\n", mapfile, name_idx));
+
+       for (i=0; lines[i]; i++) {
+               char *unixname = lines[i];
+               char *dosname = strchr(unixname,'=');
+
+               if (!dosname)
+                       continue;
+
+               *dosname++ = 0;
+
+               while (isspace(*unixname))
+                       unixname++;
+               if ('!' == *unixname) {
+                       unixname++;
+                       while (*unixname && isspace(*unixname))
+                               unixname++;
+               }
+    
+               if (!*unixname || strchr("#;",*unixname))
+                       continue;
+
+               if (strncmp(unixname, unix_user_name, strlen(unix_user_name)))
+                       continue;
+
+               /* We have matched the UNIX user name */
+
+               while(next_token(&dosname, tok, LIST_SEP, sizeof(tok))) {
+                       if (!strchr("@&+", *tok)) {
+                               name_idx--;
+                               if (name_idx < 0 ) {
+                                       break;
+                               }
+                       }
+               }
+
+               if (name_idx >= 0) {
+                       DEBUG(0,("unmap_unixname: index too high - not that many DOS names\n"));
+                       file_lines_free(lines);
+                       return NULL;
+               } else {
+                       file_lines_free(lines);
+                       return tok;
+               }
+       }
+
+       DEBUG(0,("unmap_unixname: Couldn't find the UNIX user name\n"));
+       file_lines_free(lines);
+       return NULL;
+}
+
+/*******************************************************************
+ 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.)
+********************************************************************/
+
+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 struct passwd *pwd = NULL;
+       static uint32 pw_rid;
+       static BOOL orig_done = False;
+       static int current_idx = 0;
+       static int mapped_idx = 0;
+
+       DEBUG(5, ("get_passwd_entries: retrieving a list of UNIX users\n"));
+
+       (*num_entries) = 0;
+       (*total_entries) = 0;
+
+       if (pw_buf == NULL) return False;
+
+       if (current_idx == 0) {
+               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 = 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 */
+               endpwent();
+               setpwent();
+               current_idx = 0;
+               mapped_idx = 0;
+               orig_done = False;
+               while (current_idx < start_idx) {
+                       char *unmap_name;
+
+                       if(!orig_done) {
+                               if ((pwd = 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;
+                       }
+               }
+       }
+
+       /* 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 = getpwent()) == NULL) break;
+                       user_name_len = strlen(pwd->pw_name);
+                       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));
+
+                       (*num_entries)++;
+                       (*total_entries)++;
+                       current_idx++;
+                       orig_done = True;
+               }
+
+               /* 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));
+
+                       (*num_entries)++;
+                       (*total_entries)++;
+                       current_idx++;
+                       mapped_idx++;
+               }
+
+               if (unmap_name == NULL) {
+                       /* done with 'aliases', go on to next UNIX user */
+                       orig_done = False;
+                       mapped_idx = 0;
+               }
+       }
+
+       if (pwd == NULL) {
+               /* totally done, reset everything */
+               endpwent();
+               current_idx = 0;
+               mapped_idx = 0;
+       }
+
+       return (*num_entries) > 0;
+}
+
 /*******************************************************************
  samr_reply_unknown_1
  ********************************************************************/
-static void samr_reply_close_hnd(SAMR_Q_CLOSE_HND *q_u,
+static BOOL samr_reply_close_hnd(SAMR_Q_CLOSE_HND *q_u,
                                prs_struct *rdata)
 {
        SAMR_R_CLOSE_HND r_u;
 
        /* set up the SAMR unknown_1 response */
-       bzero(r_u.pol.data, POL_HND_SIZE);
+       memset((char *)r_u.pol.data, '\0', POL_HND_SIZE);
 
        /* close the policy handle */
        if (close_lsa_policy_hnd(&(q_u->pol)))
@@ -122,41 +354,48 @@ static void samr_reply_close_hnd(SAMR_Q_CLOSE_HND *q_u,
        DEBUG(5,("samr_reply_close_hnd: %d\n", __LINE__));
 
        /* store the response in the SMB stream */
-       samr_io_r_close_hnd("", &r_u, rdata, 0);
+       if(!samr_io_r_close_hnd("", &r_u, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_reply_close_hnd: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_close_hnd
  ********************************************************************/
-static void api_samr_close_hnd( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_close_hnd(pipes_struct *p)
 {
        SAMR_Q_CLOSE_HND q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr unknown 1 */
-       samr_io_q_close_hnd("", &q_u, data, 0);
+       if(!samr_io_q_close_hnd("", &q_u, data, 0))
+               return False;
 
        /* construct reply.  always indicate success */
-       samr_reply_close_hnd(&q_u, rdata);
+       if(!samr_reply_close_hnd(&q_u, rdata))
+               return False;
+
+       return True;
 }
 
 
 /*******************************************************************
  samr_reply_open_domain
  ********************************************************************/
-static void samr_reply_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
+static BOOL samr_reply_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
                                prs_struct *rdata)
 {
        SAMR_R_OPEN_DOMAIN r_u;
        BOOL pol_open = False;
-       int pol_idx;
 
        r_u.status = 0x0;
 
        /* find the connection policy handle. */
-       if (r_u.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->connect_pol))) == -1))
+       if (r_u.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->connect_pol)) == -1))
        {
                r_u.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
@@ -182,43 +421,105 @@ static void samr_reply_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
        DEBUG(5,("samr_open_domain: %d\n", __LINE__));
 
        /* store the response in the SMB stream */
-       samr_io_r_open_domain("", &r_u, rdata, 0);
+       if(!samr_io_r_open_domain("", &r_u, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_open_domain: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_open_domain
  ********************************************************************/
-static void api_samr_open_domain( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_open_domain(pipes_struct *p)
 {
        SAMR_Q_OPEN_DOMAIN q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
+
+       /* grab the samr open */
+       if(!samr_io_q_open_domain("", &q_u, data, 0))
+               return False;
+
+       /* construct reply.  always indicate success */
+       if(!samr_reply_open_domain(&q_u, rdata))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ samr_reply_unknown_2c
+ ********************************************************************/
+static BOOL samr_reply_unknown_2c(SAMR_Q_UNKNOWN_2C *q_u,
+                               prs_struct *rdata)
+{
+       SAMR_R_UNKNOWN_2C r_u;
+       uint32 status = 0x0;
+
+       /* find the policy handle.  open a policy on it. */
+       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->user_pol)) == -1))
+       {
+               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+       }
+
+       /* find the user's rid */
+       if ((status == 0x0) && (get_lsa_policy_samr_rid(&(q_u->user_pol)) == 0xffffffff))
+       {
+               status = NT_STATUS_OBJECT_TYPE_MISMATCH;
+       }
+
+       init_samr_r_unknown_2c(&r_u, status);
+
+       DEBUG(5,("samr_unknown_2c: %d\n", __LINE__));
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_unknown_2c("", &r_u, rdata, 0))
+               return False;
+
+       DEBUG(5,("samr_unknown_2c: %d\n", __LINE__));
+
+       return True;
+}
+
+/*******************************************************************
+ api_samr_unknown_2c
+ ********************************************************************/
+static BOOL api_samr_unknown_2c(pipes_struct *p)
+{
+       SAMR_Q_UNKNOWN_2C q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr open */
-       samr_io_q_open_domain("", &q_u, data, 0);
+       if(!samr_io_q_unknown_2c("", &q_u, data, 0))
+               return False;
 
        /* construct reply.  always indicate success */
-       samr_reply_open_domain(&q_u, rdata);
+       if(!samr_reply_unknown_2c(&q_u, rdata))
+               return False;
+
+       return True;
 }
 
 
 /*******************************************************************
  samr_reply_unknown_3
  ********************************************************************/
-static void samr_reply_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
+static BOOL samr_reply_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
                                prs_struct *rdata)
 {
        SAMR_R_UNKNOWN_3 r_u;
        DOM_SID3 sid[MAX_SAM_SIDS];
-       int pol_idx;
        uint32 rid;
        uint32 status;
 
        status = 0x0;
 
        /* find the policy handle.  open a policy on it. */
-       if (status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->user_pol))) == -1))
+       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->user_pol)) == -1))
        {
                status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
@@ -231,27 +532,27 @@ static void samr_reply_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
 
        if (status == 0x0)
        {
-        DOM_SID user_sid;
-        DOM_SID other_sid;
+               DOM_SID user_sid;
+               DOM_SID everyone_sid;
 
-        user_sid = global_machine_sid;
+               user_sid = global_sam_sid;
 
-       ASSERT_ARRAY(user_sid.sub_auths, user_sid.num_auths+1);
+               SMB_ASSERT_ARRAY(user_sid.sub_auths, user_sid.num_auths+1);
 
-        /*
-         * Add the user RID.
-         */
-        user_sid.sub_auths[user_sid.num_auths++] = rid;
-        
-               string_to_sid(&other_sid, "S-1-1");
+               /*
+                * Add the user RID.
+                */
+               user_sid.sub_auths[user_sid.num_auths++] = rid;
+               
+                       string_to_sid(&everyone_sid, "S-1-1");
 
-               /* maybe need another 1 or 2 (S-1-5-20-0x220 and S-1-5-20-0x224) */
-               /* these two are DOMAIN_ADMIN and DOMAIN_ACCT_OP group RIDs */
-               make_dom_sid3(&(sid[0]), 0x035b, 0x0002, &other_sid);
-               make_dom_sid3(&(sid[1]), 0x0044, 0x0002, &user_sid);
+                       /* maybe need another 1 or 2 (S-1-5-0x20-0x220 and S-1-5-20-0x224) */
+                       /* these two are DOMAIN_ADMIN and DOMAIN_ACCT_OP group RIDs */
+                       init_dom_sid3(&(sid[0]), 0x035b, 0x0002, &everyone_sid);
+                       init_dom_sid3(&(sid[1]), 0x0044, 0x0002, &user_sid);
        }
 
-       make_samr_r_unknown_3(&r_u,
+       init_samr_r_unknown_3(&r_u,
                                0x0001, 0x8004,
                                0x00000014, 0x0002, 0x0070,
                                2, sid, status);
@@ -259,91 +560,103 @@ static void samr_reply_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
        DEBUG(5,("samr_unknown_3: %d\n", __LINE__));
 
        /* store the response in the SMB stream */
-       samr_io_r_unknown_3("", &r_u, rdata, 0);
+       if(!samr_io_r_unknown_3("", &r_u, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_unknown_3: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_unknown_3
  ********************************************************************/
-static void api_samr_unknown_3( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_3(pipes_struct *p)
 {
        SAMR_Q_UNKNOWN_3 q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr open */
-       samr_io_q_unknown_3("", &q_u, data, 0);
+       if(!samr_io_q_unknown_3("", &q_u, data, 0))
+               return False;
 
        /* construct reply.  always indicate success */
-       samr_reply_unknown_3(&q_u, rdata);
+       if(!samr_reply_unknown_3(&q_u, rdata))
+               return False;
+
+       return True;
 }
 
 
 /*******************************************************************
  samr_reply_enum_dom_users
  ********************************************************************/
-static void samr_reply_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_u,
+static BOOL samr_reply_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_u,
                                prs_struct *rdata)
 {
        SAMR_R_ENUM_DOM_USERS r_e;
        SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
        int num_entries;
        int total_entries;
-       int pol_idx;
-       BOOL got_pwds;
 
        r_e.status = 0x0;
        r_e.total_num_entries = 0;
 
        /* find the policy handle.  open a policy on it. */
-       if (r_e.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
+       if (r_e.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
        {
                r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
 
        DEBUG(5,("samr_reply_enum_dom_users: %d\n", __LINE__));
 
-       become_root(True);
-       got_pwds = get_sampwd_entries(pass, &total_entries, &num_entries, MAX_SAM_ENTRIES, q_u->acb_mask);
-       unbecome_root(True);
+       become_root();
+       get_sampwd_entries(pass, 0, &total_entries, &num_entries, MAX_SAM_ENTRIES, q_u->acb_mask);
+       unbecome_root();
 
-       make_samr_r_enum_dom_users(&r_e, total_entries,
+       init_samr_r_enum_dom_users(&r_e, total_entries,
                                   q_u->unknown_0, num_entries,
                                   pass, r_e.status);
 
        /* store the response in the SMB stream */
-       samr_io_r_enum_dom_users("", &r_e, rdata, 0);
+       if(!samr_io_r_enum_dom_users("", &r_e, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_enum_dom_users: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_enum_dom_users
  ********************************************************************/
-static void api_samr_enum_dom_users( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_enum_dom_users(pipes_struct *p)
 {
        SAMR_Q_ENUM_DOM_USERS q_e;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr open */
-       samr_io_q_enum_dom_users("", &q_e, data, 0);
+       if(!samr_io_q_enum_dom_users("", &q_e, data, 0))
+               return False;
 
        /* construct reply. */
-       samr_reply_enum_dom_users(&q_e, rdata);
-}
+       if(!samr_reply_enum_dom_users(&q_e, rdata))
+               return False;
 
+       return True;
+}
 
 /*******************************************************************
  samr_reply_enum_dom_groups
  ********************************************************************/
-static void samr_reply_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_u,
+static BOOL samr_reply_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_u,
                                prs_struct *rdata)
 {
        SAMR_R_ENUM_DOM_GROUPS r_e;
        SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
        int num_entries;
-       int pol_idx;
        BOOL got_grps;
        char *dummy_group = "Domain Admins";
 
@@ -351,7 +664,7 @@ static void samr_reply_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_u,
        r_e.num_entries = 0;
 
        /* find the policy handle.  open a policy on it. */
-       if (r_e.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
+       if (r_e.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
        {
                r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
@@ -360,241 +673,331 @@ static void samr_reply_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_u,
 
        got_grps = True;
        num_entries = 1;
-       make_unistr2(&(pass[0].uni_user_name), dummy_group, strlen(dummy_group));
+       ZERO_STRUCTP(&pass[0]);
+       init_unistr2(&(pass[0].uni_user_name), dummy_group, strlen(dummy_group));
        pass[0].user_rid = DOMAIN_GROUP_RID_ADMINS;
 
        if (r_e.status == 0 && got_grps)
        {
-               make_samr_r_enum_dom_groups(&r_e, q_u->start_idx, num_entries, pass, r_e.status);
+               init_samr_r_enum_dom_groups(&r_e, q_u->start_idx, num_entries, pass, r_e.status);
        }
 
        /* store the response in the SMB stream */
-       samr_io_r_enum_dom_groups("", &r_e, rdata, 0);
+       if(!samr_io_r_enum_dom_groups("", &r_e, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_enum_dom_groups: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_enum_dom_groups
  ********************************************************************/
-static void api_samr_enum_dom_groups( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_enum_dom_groups(pipes_struct *p)
 {
        SAMR_Q_ENUM_DOM_GROUPS q_e;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr open */
-       samr_io_q_enum_dom_groups("", &q_e, data, 0);
+       if(!samr_io_q_enum_dom_groups("", &q_e, data, 0))
+               return False;
 
        /* construct reply. */
-       samr_reply_enum_dom_groups(&q_e, rdata);
-}
+       if(!samr_reply_enum_dom_groups(&q_e, rdata))
+               return False;
 
+       return True;
+}
 
 /*******************************************************************
  samr_reply_enum_dom_aliases
  ********************************************************************/
-static void samr_reply_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_u,
+static BOOL samr_reply_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_u,
                                prs_struct *rdata)
 {
        SAMR_R_ENUM_DOM_ALIASES r_e;
        SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
-       int num_entries;
-       int pol_idx;
-       BOOL got_aliases;
-       char *dummy_alias = "admins";
+       int num_entries = 0;
+       DOM_SID sid;
+       fstring sid_str;
+       fstring sam_sid_str;
+       struct group *grp;
 
        r_e.status = 0x0;
        r_e.num_entries = 0;
 
        /* find the policy handle.  open a policy on it. */
-       if (r_e.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
+       if (r_e.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &sid))
        {
                r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
 
-       DEBUG(5,("samr_reply_enum_dom_aliases: %d\n", __LINE__));
+       sid_to_string(sid_str, &sid);
+       sid_to_string(sam_sid_str, &global_sam_sid);
 
-       got_aliases = True;
-       num_entries = 1;
-       make_unistr2(&(pass[0].uni_user_name), dummy_alias, strlen(dummy_alias));
-       pass[0].user_rid = BUILTIN_ALIAS_RID_ADMINS;
+       DEBUG(5,("samr_reply_enum_dom_aliases: sid %s\n", sid_str));
 
-       if (r_e.status == 0 && got_aliases)
+       /* well-known aliases */
+       if (strequal(sid_str, "S-1-5-32"))
+       {
+               char *name;
+               while (num_entries < MAX_SAM_ENTRIES && ((name = builtin_alias_rids[num_entries].name) != NULL))
+               {
+                       init_unistr2(&(pass[num_entries].uni_user_name), name, strlen(name));
+                       pass[num_entries].user_rid = builtin_alias_rids[num_entries].rid;
+                       num_entries++;
+               }
+       }
+       else if (strequal(sid_str, sam_sid_str))
        {
-               make_samr_r_enum_dom_aliases(&r_e, num_entries, pass, r_e.status);
+               char *name;
+               /* 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_SAM_ENTRIES && ((grp = getgrent()) != NULL))
+               {
+                       name = grp->gr_name;
+                       init_unistr2(&(pass[num_entries].uni_user_name), name, strlen(name));
+                       pass[num_entries].user_rid = pdb_gid_to_group_rid(grp->gr_gid);
+                       num_entries++;
+               }
+
+               endgrent();
        }
+               
+       init_samr_r_enum_dom_aliases(&r_e, num_entries, pass, r_e.status);
 
        /* store the response in the SMB stream */
-       samr_io_r_enum_dom_aliases("", &r_e, rdata, 0);
+       if(!samr_io_r_enum_dom_aliases("", &r_e, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_enum_dom_aliases: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_enum_dom_aliases
  ********************************************************************/
-static void api_samr_enum_dom_aliases( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_enum_dom_aliases(pipes_struct *p)
 {
        SAMR_Q_ENUM_DOM_ALIASES q_e;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr open */
-       samr_io_q_enum_dom_aliases("", &q_e, data, 0);
+       if(!samr_io_q_enum_dom_aliases("", &q_e, data, 0))
+               return False;
 
        /* construct reply. */
-       samr_reply_enum_dom_aliases(&q_e, rdata);
+       if(!samr_reply_enum_dom_aliases(&q_e, rdata))
+               return False;
+
+       return True;
 }
 
 
 /*******************************************************************
  samr_reply_query_dispinfo
  ********************************************************************/
-static void samr_reply_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_u,
-                               prs_struct *rdata)
+static BOOL samr_reply_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_u, prs_struct *rdata)
 {
        SAMR_R_QUERY_DISPINFO r_e;
        SAM_INFO_CTR ctr;
        SAM_INFO_1 info1;
        SAM_INFO_2 info2;
        SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
-       int num_entries;
-       int total_entries;
-       int pol_idx;
+       int num_entries = 0;
+       int total_entries = 0;
        BOOL got_pwds;
        uint16 switch_level = 0x0;
 
+       ZERO_STRUCT(r_e);
+
        r_e.status = 0x0;
 
+       DEBUG(5,("samr_reply_query_dispinfo: %d\n", __LINE__));
+
        /* find the policy handle.  open a policy on it. */
-       if (r_e.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
+       if (r_e.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
        {
                r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+               DEBUG(5,("samr_reply_query_dispinfo: invalid handle\n"));
        }
 
-       DEBUG(5,("samr_reply_query_dispinfo: %d\n", __LINE__));
-
-       become_root(True);
-       got_pwds = get_sampwd_entries(pass, &total_entries, &num_entries, MAX_SAM_ENTRIES, 0);
-       unbecome_root(True);
-
-       switch (q_u->switch_level)
+       if (r_e.status == 0x0)
        {
-               case 0x1:
+         /* decide how many entries to get depending on the max_entries 
+            and max_size passed by client */
+         uint32 retsize;
+
+         if(q_u->max_entries > MAX_SAM_ENTRIES)
+           q_u->max_entries = MAX_SAM_ENTRIES;
+         
+         retsize = (q_u->max_entries * (sizeof(SAM_ENTRY1)+sizeof(SAM_STR1)))
+           + 3*sizeof(uint32);
+
+         if(retsize > q_u->max_size)
+           {
+             /* determine max_entries based on max_size */
+             q_u->max_entries = (q_u->max_size - 3*sizeof(uint32)) /
+               (sizeof(SAM_ENTRY1)+sizeof(SAM_STR1));
+             q_u->max_entries = (q_u->max_entries>0?q_u->max_entries:1);
+           }
+
+         DEBUG(10,("samr_reply_query_dispinfo: Setting q_u->max_entries to %u\n",q_u->max_entries));
+
+               become_root();
+               got_pwds = get_passwd_entries(pass, q_u->start_idx, &total_entries, &num_entries, q_u->max_entries, 0);
+               unbecome_root();
+
+               /* more left - set resume handle */
+               if(total_entries > num_entries)
+                 {
+                   r_e.status = 0x105;
+                 }
+
+               switch (q_u->switch_level)
                {
-               
-                       /* query disp info is for users */
-                       switch_level = 0x1;
-                       make_sam_info_1(&info1, ACB_NORMAL,
-                               q_u->start_idx, num_entries, pass);
+                       case 0x1:
+                       {
+                       
+                               /* query disp info is for users */
+                               switch_level = 0x1;
+                               init_sam_info_1(&info1, ACB_NORMAL,
+                                       q_u->start_idx, num_entries, pass);
 
-                       ctr.sam.info1 = &info1;
+                               ctr.sam.info1 = &info1;
 
-                       break;
-               }
-               case 0x2:
-               {
-                       /* query disp info is for servers */
-                       switch_level = 0x2;
-                       make_sam_info_2(&info2, ACB_WSTRUST,
-                               q_u->start_idx, num_entries, pass);
+                               break;
+                       }
+                       case 0x2:
+                       {
+                               /* query disp info is for servers */
+                               switch_level = 0x2;
+                               init_sam_info_2(&info2, ACB_WSTRUST,
+                                       q_u->start_idx, num_entries, pass);
 
-                       ctr.sam.info2 = &info2;
+                               ctr.sam.info2 = &info2;
 
-                       break;
+                               break;
+                       }
                }
        }
 
-       if (r_e.status == 0 && got_pwds)
+       /* more left - set resume handle */
+       if(total_entries > num_entries)
+         {
+           r_e.status = 0x105;
+         }
+
+       if (r_e.status == 0 || r_e.status == 0x105)
        {
-               make_samr_r_query_dispinfo(&r_e, switch_level, &ctr, r_e.status);
+         init_samr_r_query_dispinfo(&r_e, switch_level, &ctr, r_e.status);
        }
 
        /* store the response in the SMB stream */
-       samr_io_r_query_dispinfo("", &r_e, rdata, 0);
+       if(!samr_io_r_query_dispinfo("", &r_e, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_query_dispinfo: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_query_dispinfo
  ********************************************************************/
-static void api_samr_query_dispinfo( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_dispinfo(pipes_struct *p)
 {
        SAMR_Q_QUERY_DISPINFO q_e;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr open */
-       samr_io_q_query_dispinfo("", &q_e, data, 0);
+       if(!samr_io_q_query_dispinfo("", &q_e, data, 0))
+               return False;
 
        /* construct reply. */
-       samr_reply_query_dispinfo(&q_e, rdata);
+       if(!samr_reply_query_dispinfo(&q_e, rdata))
+               return False;
+
+       return True;
 }
 
 
 /*******************************************************************
  samr_reply_query_aliasinfo
  ********************************************************************/
-static void samr_reply_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_u,
+static BOOL samr_reply_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_u,
                                prs_struct *rdata)
 {
-       SAMR_R_QUERY_ALIASINFO r_e;
-       int pol_idx;
-       BOOL got_alias;
-
-       r_e.status = 0x0;
-       r_e.ptr = 0;
-
-       /* find the policy handle.  open a policy on it. */
-       if (r_e.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
-       {
-               r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
-       }
-
-       DEBUG(5,("samr_reply_query_aliasinfo: %d\n", __LINE__));
-
-       if (r_e.status == 0x0)
-       {
-               if (q_u->switch_level != 3)
-               {
-                       r_e.status = NT_STATUS_INVALID_INFO_CLASS;
-               }
-       }
-
-       if (r_e.status == 0x0)
-       {
-               got_alias = True;
-       }
-
-       make_samr_r_query_aliasinfo(&r_e, q_u->switch_level,
-                           "<account description>",
-                               r_e.status);
-
-       /* store the response in the SMB stream */
-       samr_io_r_query_aliasinfo("", &r_e, rdata, 0);
-
-       DEBUG(5,("samr_query_aliasinfo: %d\n", __LINE__));
+  SAMR_R_QUERY_ALIASINFO r_e;
+  fstring alias_desc = "Local Unix group";
+  fstring alias="";
+  uint8 type;
+  uint32 alias_rid;
+
+  ZERO_STRUCT(r_e);
+
+  DEBUG(5,("samr_reply_query_aliasinfo: %d\n", __LINE__));
+
+  /* find the policy handle.  open a policy on it. */
+  if (r_e.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
+    {
+      r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+    }
+
+  alias_rid = get_lsa_policy_samr_rid(&q_u->pol);
+  if(alias_rid == 0xffffffff)
+      r_e.status = 0xC0000000 | NT_STATUS_NO_SUCH_ALIAS;
+
+  if(!lookup_local_rid(alias_rid, alias, &type))
+    {
+      r_e.status = 0xC0000000 | NT_STATUS_NO_SUCH_ALIAS;
+    }
+  
+  init_samr_r_query_aliasinfo(&r_e, q_u->switch_level, alias, alias_desc);
+  
+  /* store the response in the SMB stream */
+  if(!samr_io_r_query_aliasinfo("", &r_e, rdata, 0))
+               return False;
+  
+  DEBUG(5,("samr_query_aliasinfo: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_query_aliasinfo
  ********************************************************************/
-static void api_samr_query_aliasinfo( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_aliasinfo(pipes_struct *p)
 {
        SAMR_Q_QUERY_ALIASINFO q_e;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr open */
-       samr_io_q_query_aliasinfo("", &q_e, data, 0);
+       if(!samr_io_q_query_aliasinfo("", &q_e, data, 0))
+               return False;
 
        /* construct reply. */
-       samr_reply_query_aliasinfo(&q_e, rdata);
+       if(!samr_reply_query_aliasinfo(&q_e, rdata))
+               return False;
+
+       return True;
 }
 
 
 /*******************************************************************
  samr_reply_lookup_ids
  ********************************************************************/
-static void samr_reply_lookup_ids(SAMR_Q_LOOKUP_IDS *q_u,
+static BOOL samr_reply_lookup_ids(SAMR_Q_LOOKUP_IDS *q_u,
                                prs_struct *rdata)
 {
        uint32 rid[MAX_SAM_ENTRIES];
@@ -613,31 +1016,30 @@ static void samr_reply_lookup_ids(SAMR_Q_LOOKUP_IDS *q_u,
 
 #if 0
        int i;
-       ASSERT_ARRAY(q_u->uni_user_name, num_rids);
+       SMB_ASSERT_ARRAY(q_u->uni_user_name, num_rids);
 
        for (i = 0; i < num_rids && status == 0; i++)
        {
-               struct smb_passwd *smb_pass;
+               struct sam_passwd *sam_pass;
                fstring user_name;
 
 
                fstrcpy(user_name, unistrn2(q_u->uni_user_name[i].buffer,
-                                                                       q_u->uni_user_name[i].uni_str_len));
+                                           q_u->uni_user_name[i].uni_str_len));
 
                /* find the user account */
-               become_root(True);
-               smb_pass = get_sampwd_entry(user_name, 0);
-               unbecome_root(True);
+               become_root();
+               sam_pass = get_smb21pwd_entry(user_name, 0);
+               unbecome_root();
 
-               if (smb_pass == NULL)
+               if (sam_pass == NULL)
                {
                        status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
                        rid[i] = 0;
                }
                else
                {
-                       /* lkclXXXX SHOULD use name_to_rid() here! */
-                       rid[i] = smb_pass->smb_userid;
+                       rid[i] = sam_pass->user_rid;
                }
        }
 #endif
@@ -645,107 +1047,255 @@ static void samr_reply_lookup_ids(SAMR_Q_LOOKUP_IDS *q_u,
        num_rids = 1;
        rid[0] = BUILTIN_ALIAS_RID_USERS;
 
-       make_samr_r_lookup_ids(&r_u, num_rids, rid, status);
+       init_samr_r_lookup_ids(&r_u, num_rids, rid, status);
 
        /* store the response in the SMB stream */
-       samr_io_r_lookup_ids("", &r_u, rdata, 0);
+       if(!samr_io_r_lookup_ids("", &r_u, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_lookup_ids: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_lookup_ids
  ********************************************************************/
-static void api_samr_lookup_ids( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_lookup_ids(pipes_struct *p)
 {
        SAMR_Q_LOOKUP_IDS q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
+
+       /* grab the samr 0x10 */
+       if(!samr_io_q_lookup_ids("", &q_u, data, 0))
+               return False;
+
+       /* construct reply.  always indicate success */
+       if(!samr_reply_lookup_ids(&q_u, rdata))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ samr_reply_lookup_names
+ ********************************************************************/
+
+static BOOL samr_reply_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
+                                   prs_struct *rdata)
+{
+  uint32 rid[MAX_SAM_ENTRIES];
+  uint8  type[MAX_SAM_ENTRIES];
+  uint32 status = 0;
+  int i;
+  int num_rids = q_u->num_names1;
+  DOM_SID pol_sid;
+
+  SAMR_R_LOOKUP_NAMES r_u;
+
+  DEBUG(5,("samr_lookup_names: %d\n", __LINE__));
+
+  ZERO_ARRAY(rid);
+  ZERO_ARRAY(type);
+
+  if (!get_lsa_policy_samr_sid(&q_u->pol, &pol_sid)) {
+    status = 0xC0000000 | NT_STATUS_OBJECT_TYPE_MISMATCH;
+    init_samr_r_lookup_names(&r_u, 0, rid, type, status);
+    if(!samr_io_r_lookup_names("", &r_u, rdata, 0)) {
+      DEBUG(0,("samr_reply_lookup_names: failed to marshall SAMR_R_LOOKUP_NAMES.\n"));
+      return False;
+    }
+    return True;
+  }
+
+  if (num_rids > MAX_SAM_ENTRIES) {
+    num_rids = MAX_SAM_ENTRIES;
+    DEBUG(5,("samr_lookup_names: truncating entries to %d\n", num_rids));
+  }
+
+  SMB_ASSERT_ARRAY(q_u->uni_name, num_rids);
+
+  for (i = 0; i < num_rids; i++) {
+    fstring name;
+
+    status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
+
+    rid [i] = 0xffffffff;
+    type[i] = SID_NAME_UNKNOWN;
+
+    fstrcpy(name, dos_unistrn2(q_u->uni_name[i].buffer,
+                              q_u->uni_name[i].uni_str_len));
+
+    if(sid_equal(&pol_sid, &global_sam_sid)) 
+    {
+      DOM_SID sid;
+      if(lookup_local_name(global_myname, name, 
+                          &sid, &type[i]))
+       {
+         sid_split_rid( &sid, &rid[i]);
+         status = 0;
+       }
+    }
+  }
+
+  init_samr_r_lookup_names(&r_u, num_rids, rid, type, status);
+
+  /* store the response in the SMB stream */
+  if(!samr_io_r_lookup_names("", &r_u, rdata, 0)) {
+    DEBUG(0,("samr_reply_lookup_names: failed to marshall SAMR_R_LOOKUP_NAMES.\n"));
+    return False;
+  }
+
+  DEBUG(5,("samr_lookup_names: %d\n", __LINE__));
+
+  return True;
+}
+
+/*******************************************************************
+ api_samr_lookup_names
+ ********************************************************************/
+
+static BOOL api_samr_lookup_names(pipes_struct *p)
+{
+       SAMR_Q_LOOKUP_NAMES q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       /* grab the samr 0x10 */
-       samr_io_q_lookup_ids("", &q_u, data, 0);
+       memset(&q_u, '\0', sizeof(q_u));
+
+       /* grab the samr lookup names */
+       if(!samr_io_q_lookup_names("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_lookup_names: failed to unmarshall SAMR_Q_LOOKUP_NAMES.\n"));
+               return False;
+       }
 
        /* construct reply.  always indicate success */
-       samr_reply_lookup_ids(&q_u, rdata);
+       if(!samr_reply_lookup_names(&q_u, rdata))
+               return False;
+
+       return True;
 }
 
 /*******************************************************************
- samr_reply_lookup_names
+ samr_reply_chgpasswd_user
  ********************************************************************/
-static void samr_reply_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
+
+static BOOL samr_reply_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
                                prs_struct *rdata)
 {
-       uint32 rid[MAX_SAM_ENTRIES];
-       uint32 status     = 0;
-       int i;
-       int num_rids = q_u->num_rids1;
+       SAMR_R_CHGPASSWD_USER r_u;
+       uint32 status = 0x0;
+       fstring user_name;
+       fstring wks;
 
-       SAMR_R_LOOKUP_NAMES r_u;
+       fstrcpy(user_name, dos_unistrn2(q_u->uni_user_name.buffer, q_u->uni_user_name.uni_str_len));
+       fstrcpy(wks      , dos_unistrn2(q_u->uni_dest_host.buffer, q_u->uni_dest_host.uni_str_len));
 
-       DEBUG(5,("samr_lookup_names: %d\n", __LINE__));
+       DEBUG(5,("samr_chgpasswd_user: user: %s wks: %s\n", user_name, wks));
 
-       if (num_rids > MAX_SAM_ENTRIES)
+       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))
        {
-               num_rids = MAX_SAM_ENTRIES;
-               DEBUG(5,("samr_lookup_names: truncating entries to %d\n", num_rids));
+               status = 0xC0000000 | NT_STATUS_WRONG_PASSWORD;
        }
 
-       ASSERT_ARRAY(q_u->uni_user_name, num_rids);
+       init_samr_r_chgpasswd_user(&r_u, status);
 
-       for (i = 0; i < num_rids && status == 0; i++)
-       {
-               fstring name;
+       /* store the response in the SMB stream */
+       if(!samr_io_r_chgpasswd_user("", &r_u, rdata, 0)) {
+               DEBUG(0,("samr_reply_chgpasswd_user: Failed to marshall SAMR_R_CHGPASSWD_USER struct.\n" ));
+               return False;
+       }
+
+       DEBUG(5,("samr_chgpasswd_user: %d\n", __LINE__));
+       return True;
+}
+
+/*******************************************************************
+ api_samr_chgpasswd_user
+ ********************************************************************/
 
-               status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
+static BOOL api_samr_chgpasswd_user(pipes_struct *p)
+{
+       SAMR_Q_CHGPASSWD_USER q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-               fstrcpy(name, unistrn2(q_u->uni_user_name[i].buffer, q_u->uni_user_name[i].uni_str_len));
+       /* unknown 38 command */
+       if (!samr_io_q_chgpasswd_user("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_chgpasswd_user: samr_io_q_chgpasswd_user failed to parse RPC packet.\n"));
+               return False;
+       }
 
-               status = (status != 0x0) ? lookup_user_rid (name, &(rid[i])) : status;
-               status = (status != 0x0) ? lookup_group_rid(name, &(rid[i])) : status;
-               status = (status != 0x0) ? lookup_alias_rid(name, &(rid[i])) : status;
+       /* construct reply. */
+       if(!samr_reply_chgpasswd_user(&q_u, rdata)) {
+               DEBUG(0,("api_samr_chgpasswd_user: samr_reply_chgpasswd_user failed to create reply packet.\n"));
+               return False;
        }
 
-       make_samr_r_lookup_names(&r_u, num_rids, rid, status);
+       return True;
+}
 
-       /* store the response in the SMB stream */
-       samr_io_r_lookup_names("", &r_u, rdata, 0);
 
-       DEBUG(5,("samr_lookup_names: %d\n", __LINE__));
+/*******************************************************************
+ samr_reply_unknown_38
+ ********************************************************************/
+static BOOL samr_reply_unknown_38(SAMR_Q_UNKNOWN_38 *q_u, prs_struct *rdata)
+{
+       SAMR_R_UNKNOWN_38 r_u;
+
+       DEBUG(5,("samr_unknown_38: %d\n", __LINE__));
 
+       init_samr_r_unknown_38(&r_u);
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_unknown_38("", &r_u, rdata, 0))
+               return False;
+
+       DEBUG(5,("samr_unknown_38: %d\n", __LINE__));
+       return True;
 }
 
 /*******************************************************************
- api_samr_lookup_names
+ api_samr_unknown_38
  ********************************************************************/
-static void api_samr_lookup_names( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_38(pipes_struct *p)
 {
-       SAMR_Q_LOOKUP_NAMES q_u;
+       SAMR_Q_UNKNOWN_38 q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       /* grab the samr lookup names */
-       samr_io_q_lookup_names("", &q_u, data, 0);
+       /* unknown 38 command */
+       if(!samr_io_q_unknown_38("", &q_u, data, 0))
+               return False;
 
        /* construct reply.  always indicate success */
-       samr_reply_lookup_names(&q_u, rdata);
+       if(!samr_reply_unknown_38(&q_u, rdata))
+               return False;
+
+       return True;
 }
 
 
 /*******************************************************************
  samr_reply_unknown_12
  ********************************************************************/
-static void samr_reply_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
+static BOOL samr_reply_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
                                prs_struct *rdata)
 {
        fstring group_names[MAX_SAM_ENTRIES];
        uint32  group_attrs[MAX_SAM_ENTRIES];
        uint32 status     = 0;
        int num_gids = q_u->num_gids1;
-       uint32 pol_idx;
 
        SAMR_R_UNKNOWN_12 r_u;
 
        DEBUG(5,("samr_unknown_12: %d\n", __LINE__));
 
        /* find the policy handle.  open a policy on it. */
-       if (status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
+       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
        {
                status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
@@ -766,49 +1316,54 @@ static void samr_reply_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
                }
        }
 
-       make_samr_r_unknown_12(&r_u, num_gids, group_names, group_attrs, status);
+       init_samr_r_unknown_12(&r_u, num_gids, group_names, group_attrs, status);
 
        /* store the response in the SMB stream */
-       samr_io_r_unknown_12("", &r_u, rdata, 0);
+       if(!samr_io_r_unknown_12("", &r_u, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_unknown_12: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_unknown_12
  ********************************************************************/
-static void api_samr_unknown_12( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_12(pipes_struct *p)
 {
        SAMR_Q_UNKNOWN_12 q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr lookup names */
-       samr_io_q_unknown_12("", &q_u, data, 0);
+       if(!samr_io_q_unknown_12("", &q_u, data, 0))
+               return False;
 
        /* construct reply.  always indicate success */
-       samr_reply_unknown_12(&q_u, rdata);
+       if(!samr_reply_unknown_12(&q_u, rdata))
+               return False;
+
+       return True;
 }
 
 
 /*******************************************************************
  samr_reply_open_user
  ********************************************************************/
-static void samr_reply_open_user(SAMR_Q_OPEN_USER *q_u,
-                               prs_struct *rdata,
-                               int status)
+static BOOL samr_reply_open_user(SAMR_Q_OPEN_USER *q_u, prs_struct *rdata, int status)
 {
        SAMR_R_OPEN_USER r_u;
-       struct smb_passwd *smb_pass;
-       int pol_idx;
+       struct sam_passwd *sam_pass;
        BOOL pol_open = False;
 
        /* set up the SAMR open_user response */
-       bzero(r_u.user_pol.data, POL_HND_SIZE);
+       memset((char *)r_u.user_pol.data, '\0', POL_HND_SIZE);
 
        r_u.status = 0x0;
 
        /* find the policy handle.  open a policy on it. */
-       if (r_u.status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->domain_pol))) == -1))
+       if (r_u.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->domain_pol)) == -1))
        {
                r_u.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
@@ -819,12 +1374,12 @@ static void samr_reply_open_user(SAMR_Q_OPEN_USER *q_u,
                r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
-       become_root(True);
-       smb_pass = getsmbpwuid(q_u->user_rid);
-       unbecome_root(True);
+       become_root();
+       sam_pass = getsam21pwrid(q_u->user_rid);
+       unbecome_root();
 
        /* check that the RID exists in our domain. */
-       if (r_u.status == 0x0 && smb_pass == NULL)
+       if (r_u.status == 0x0 && sam_pass == NULL)
        {
                r_u.status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
        }
@@ -844,27 +1399,65 @@ static void samr_reply_open_user(SAMR_Q_OPEN_USER *q_u,
        DEBUG(5,("samr_open_user: %d\n", __LINE__));
 
        /* store the response in the SMB stream */
-       samr_io_r_open_user("", &r_u, rdata, 0);
+       if(!samr_io_r_open_user("", &r_u, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_open_user: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_open_user
  ********************************************************************/
-static void api_samr_open_user( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_open_user(pipes_struct *p)
 {
        SAMR_Q_OPEN_USER q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr unknown 22 */
-       samr_io_q_open_user("", &q_u, data, 0);
+       if(!samr_io_q_open_user("", &q_u, data, 0))
+               return False;
 
        /* construct reply.  always indicate success */
-       samr_reply_open_user(&q_u, rdata, 0x0);
+       if(!samr_reply_open_user(&q_u, rdata, 0x0))
+               return False;
+
+       return True;
 }
 
 
+/*************************************************************************
+ get_user_info_10
+ *************************************************************************/
+static BOOL get_user_info_10(SAM_USER_INFO_10 *id10, uint32 user_rid)
+{
+       struct smb_passwd *smb_pass;
+
+       if (!pdb_rid_is_user(user_rid))
+       {
+               DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
+               return False;
+       }
+
+       become_root();
+       smb_pass = getsmbpwrid(user_rid);
+       unbecome_root();
+
+       if (smb_pass == NULL)
+       {
+               DEBUG(4,("User 0x%x not found\n", user_rid));
+               return False;
+       }
+
+       DEBUG(3,("User:[%s]\n", smb_pass->smb_name));
+
+       init_sam_user_info10(id10, smb_pass->acct_ctrl); 
+
+       return True;
+}
+
 /*************************************************************************
  get_user_info_21
  *************************************************************************/
@@ -877,15 +1470,17 @@ static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
 
        if (!pdb_rid_is_user(user_rid))
        {
+               DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
                return False;
        }
 
-       become_root(True);
+       become_root();
        sam_pass = getsam21pwrid(user_rid);
-       unbecome_root(True);
+       unbecome_root();
 
        if (sam_pass == NULL)
        {
+               DEBUG(4,("User 0x%x not found\n", user_rid));
                return False;
        }
 
@@ -894,17 +1489,17 @@ static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
        dummy_time.low  = 0xffffffff;
        dummy_time.high = 0x7fffffff;
 
-       DEBUG(0,("get_user_info_21 - TODO: convert unix times to NTTIMEs\n"));
+       DEBUG(5,("get_user_info_21 - TODO: convert unix times to NTTIMEs\n"));
 
        /* create a LOGON_HRS structure */
        hrs.len = sam_pass->hours_len;
-       ASSERT_ARRAY(hrs.hours, hrs.len);
+       SMB_ASSERT_ARRAY(hrs.hours, hrs.len);
        for (i = 0; i < hrs.len; i++)
        {
                hrs.hours[i] = sam_pass->hours[i];
        }
 
-       make_sam_user_info21(id21,
+       init_sam_user_info21(id21,
 
                           &dummy_time, /* logon_time */
                           &dummy_time, /* logoff_time */
@@ -940,24 +1535,24 @@ static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
 /*******************************************************************
  samr_reply_query_userinfo
  ********************************************************************/
-static void samr_reply_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
+static BOOL samr_reply_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
                                prs_struct *rdata)
 {
        SAMR_R_QUERY_USERINFO r_u;
 #if 0
        SAM_USER_INFO_11 id11;
 #endif
+       SAM_USER_INFO_10 id10;
        SAM_USER_INFO_21 id21;
        void *info = NULL;
 
        uint32 status = 0x0;
-       uint32 rid;
-       int obj_idx;
+       uint32 rid = 0x0;
 
        DEBUG(5,("samr_reply_query_userinfo: %d\n", __LINE__));
 
        /* search for the handle */
-       if (status == 0x0 && (obj_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1)
+       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
        {
                status = NT_STATUS_INVALID_HANDLE;
        }
@@ -968,11 +1563,19 @@ static void samr_reply_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
                status = NT_STATUS_OBJECT_TYPE_MISMATCH;
        }
 
+       DEBUG(5,("samr_reply_query_userinfo: rid:0x%x\n", rid));
+
        /* ok!  user info levels (there are lots: see MSDEV help), off we go... */
        if (status == 0x0)
        {
                switch (q_u->switch_value)
                {
+                       case 0x10:
+                       {
+                               info = (void*)&id10;
+                               status = get_user_info_10(&id10, rid) ? 0 : NT_STATUS_NO_SUCH_USER;
+                               break;
+                       }
 #if 0
 /* whoops - got this wrong.  i think.  or don't understand what's happening. */
                        case 0x11:
@@ -1004,49 +1607,56 @@ static void samr_reply_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
                }
        }
 
-       make_samr_r_query_userinfo(&r_u, q_u->switch_value, info, status);
+       init_samr_r_query_userinfo(&r_u, q_u->switch_value, info, status);
 
        /* store the response in the SMB stream */
-       samr_io_r_query_userinfo("", &r_u, rdata, 0);
+       if(!samr_io_r_query_userinfo("", &r_u, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_reply_query_userinfo: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_query_userinfo
  ********************************************************************/
-static void api_samr_query_userinfo( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_userinfo(pipes_struct *p)
 {
        SAMR_Q_QUERY_USERINFO q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr unknown 24 */
-       samr_io_q_query_userinfo("", &q_u, data, 0);
+       if(!samr_io_q_query_userinfo("", &q_u, data, 0))
+               return False;
 
        /* construct reply.  always indicate success */
-       samr_reply_query_userinfo(&q_u, rdata);
+       if(!samr_reply_query_userinfo(&q_u, rdata))
+               return False;
+
+       return True;
 }
 
 
 /*******************************************************************
  samr_reply_query_usergroups
  ********************************************************************/
-static void samr_reply_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
+static BOOL samr_reply_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
                                prs_struct *rdata)
 {
        SAMR_R_QUERY_USERGROUPS r_u;
        uint32 status = 0x0;
 
-       struct smb_passwd *smb_pass;
+       struct sam_passwd *sam_pass;
        DOM_GID *gids = NULL;
        int num_groups = 0;
-       int pol_idx;
        uint32 rid;
 
        DEBUG(5,("samr_query_usergroups: %d\n", __LINE__));
 
        /* find the policy handle.  open a policy on it. */
-       if (status == 0x0 && ((pol_idx = find_lsa_policy_by_hnd(&(q_u->pol))) == -1))
+       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
        {
                status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
        }
@@ -1059,11 +1669,11 @@ static void samr_reply_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
 
        if (status == 0x0)
        {
-               become_root(True);
-               smb_pass = getsmbpwuid(rid);
-               unbecome_root(True);
+               become_root();
+               sam_pass = getsam21pwrid(rid);
+               unbecome_root();
 
-               if (smb_pass == NULL)
+               if (sam_pass == NULL)
                {
                        status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
                }
@@ -1072,41 +1682,128 @@ static void samr_reply_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
        if (status == 0x0)
        {
                pstring groups;
-               get_domain_user_groups(groups, smb_pass->smb_name);
+               get_domain_user_groups(groups, sam_pass->smb_name);
                 gids = NULL;
                num_groups = make_dom_gids(groups, &gids);
        }
 
        /* construct the response.  lkclXXXX: gids are not copied! */
-       make_samr_r_query_usergroups(&r_u, num_groups, gids, status);
+       init_samr_r_query_usergroups(&r_u, num_groups, gids, status);
 
        /* store the response in the SMB stream */
-       samr_io_r_query_usergroups("", &r_u, rdata, 0);
+       if(!samr_io_r_query_usergroups("", &r_u, rdata, 0)) {
+               if (gids)
+                       free((char *)gids);
+               return False;
+       }
 
-        if(gids)
-          free((char *)gids);
-       DEBUG(5,("samr_query_usergroups: %d\n", __LINE__));
+       if (gids)
+               free((char *)gids);
 
+       DEBUG(5,("samr_query_usergroups: %d\n", __LINE__));
+       
+       return True;
 }
 
 /*******************************************************************
  api_samr_query_usergroups
  ********************************************************************/
-static void api_samr_query_usergroups( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_usergroups(pipes_struct *p)
 {
        SAMR_Q_QUERY_USERGROUPS q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
+
        /* grab the samr unknown 32 */
-       samr_io_q_query_usergroups("", &q_u, data, 0);
+       if(!samr_io_q_query_usergroups("", &q_u, data, 0))
+               return False;
 
        /* construct reply. */
-       samr_reply_query_usergroups(&q_u, rdata);
+       if(!samr_reply_query_usergroups(&q_u, rdata))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ samr_reply_query_dom_info
+ ********************************************************************/
+static BOOL samr_reply_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u, prs_struct *rdata)
+{
+       SAMR_R_QUERY_DOMAIN_INFO r_u;
+       SAM_UNK_CTR ctr;
+       uint16 switch_value = 0x0;
+       uint32 status = 0x0;
+
+       ZERO_STRUCT(r_u);
+       ZERO_STRUCT(ctr);
+
+       r_u.ctr = &ctr;
+
+       DEBUG(5,("samr_reply_query_dom_info: %d\n", __LINE__));
+
+       /* find the policy handle.  open a policy on it. */
+       if (r_u.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->domain_pol)) == -1))
+       {
+               r_u.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+               DEBUG(5,("samr_reply_query_dom_info: invalid handle\n"));
+       }
+
+       if (status == 0x0)
+       {
+               switch (q_u->switch_value)
+               {
+                       case 0x02:
+                       {
+                               switch_value = 0x2;
+                               init_unk_info2(&ctr.info.inf2, global_myworkgroup, global_myname);
+
+                               break;
+                       }
+                       default:
+                       {
+                               status = 0xC0000000 | NT_STATUS_INVALID_INFO_CLASS;
+                               break;
+                       }
+               }
+       }
+
+       init_samr_r_query_dom_info(&r_u, switch_value, &ctr, status);
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_query_dom_info("", &r_u, rdata, 0))
+               return False;
+
+       DEBUG(5,("samr_query_dom_info: %d\n", __LINE__));
+
+       return True;
 }
 
+/*******************************************************************
+ api_samr_query_dom_info
+ ********************************************************************/
+static BOOL api_samr_query_dom_info(pipes_struct *p)
+{
+       SAMR_Q_QUERY_DOMAIN_INFO q_e;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
+
+       /* grab the samr unknown 8 command */
+       if(!samr_io_q_query_dom_info("", &q_e, data, 0))
+               return False;
+
+       /* construct reply. */
+       if(!samr_reply_query_dom_info(&q_e, rdata))
+               return False;
+
+       return True;
+}
 
 /*******************************************************************
  samr_reply_unknown_32
  ********************************************************************/
-static void samr_reply_unknown_32(SAMR_Q_UNKNOWN_32 *q_u,
+static BOOL samr_reply_unknown_32(SAMR_Q_UNKNOWN_32 *q_u,
                                prs_struct *rdata,
                                int status)
 {
@@ -1114,7 +1811,7 @@ static void samr_reply_unknown_32(SAMR_Q_UNKNOWN_32 *q_u,
        SAMR_R_UNKNOWN_32 r_u;
 
        /* set up the SAMR unknown_32 response */
-       bzero(r_u.pol.data, POL_HND_SIZE);
+       memset((char *)r_u.pol.data, '\0', POL_HND_SIZE);
        if (status == 0)
        {
                for (i = 4; i < POL_HND_SIZE; i++)
@@ -1123,26 +1820,30 @@ static void samr_reply_unknown_32(SAMR_Q_UNKNOWN_32 *q_u,
                }
        }
 
-       make_dom_rid4(&(r_u.rid4), 0x0030, 0, 0);
+       init_dom_rid4(&(r_u.rid4), 0x0030, 0, 0);
        r_u.status    = status;
 
        DEBUG(5,("samr_unknown_32: %d\n", __LINE__));
 
        /* store the response in the SMB stream */
-       samr_io_r_unknown_32("", &r_u, rdata, 0);
+       if(!samr_io_r_unknown_32("", &r_u, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_unknown_32: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_unknown_32
  ********************************************************************/
-static void api_samr_unknown_32( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_32(pipes_struct *p)
 {
        uint32 status = 0;
-       struct smb_passwd *smb_pass;
+       struct sam_passwd *sam_pass;
        fstring mach_acct;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        SAMR_Q_UNKNOWN_32 q_u;
 
@@ -1155,14 +1856,14 @@ static void api_samr_unknown_32( int uid, prs_struct *data, prs_struct *rdata)
           reply if the account already exists...
         */
 
-       fstrcpy(mach_acct, unistrn2(q_u.uni_mach_acct.buffer,
+       fstrcpy(mach_acct, dos_unistrn2(q_u.uni_mach_acct.buffer,
                                    q_u.uni_mach_acct.uni_str_len));
 
-       become_root(True);
-       smb_pass = getsmbpwnam(mach_acct);
-       unbecome_root(True);
+       become_root();
+       sam_pass = getsam21pwnam(mach_acct);
+       unbecome_root();
 
-       if (smb_pass != NULL)
+       if (sam_pass != NULL)
        {
                /* machine account exists: say so */
                status = 0xC0000000 | NT_STATUS_USER_EXISTS;
@@ -1170,19 +1871,82 @@ static void api_samr_unknown_32( int uid, prs_struct *data, prs_struct *rdata)
        else
        {
                /* this could cause trouble... */
+               DEBUG(0,("trouble!\n"));
                status = 0;
        }
 
        /* construct reply. */
-       samr_reply_unknown_32(&q_u, rdata, status);
+       if(!samr_reply_unknown_32(&q_u, rdata, status))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ samr_reply_connect_anon
+ ********************************************************************/
+static BOOL samr_reply_connect_anon(SAMR_Q_CONNECT_ANON *q_u, prs_struct *rdata)
+{
+       SAMR_R_CONNECT_ANON r_u;
+       BOOL pol_open = False;
+
+       /* set up the SAMR connect_anon response */
+
+       r_u.status = 0x0;
+       /* get a (unique) handle.  open a policy on it. */
+       if (r_u.status == 0x0 && !(pol_open = open_lsa_policy_hnd(&(r_u.connect_pol))))
+       {
+               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       /* associate the domain SID with the (unique) handle. */
+       if (r_u.status == 0x0 && !set_lsa_policy_samr_pol_status(&(r_u.connect_pol), q_u->unknown_0))
+       {
+               /* oh, whoops.  don't know what error message to return, here */
+               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       if (r_u.status != 0 && pol_open)
+       {
+               close_lsa_policy_hnd(&(r_u.connect_pol));
+       }
+
+       DEBUG(5,("samr_connect_anon: %d\n", __LINE__));
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_connect_anon("", &r_u, rdata, 0))
+               return False;
+
+       DEBUG(5,("samr_connect_anon: %d\n", __LINE__));
+
+       return True;
 }
 
+/*******************************************************************
+ api_samr_connect_anon
+ ********************************************************************/
+static BOOL api_samr_connect_anon(pipes_struct *p)
+{
+       SAMR_Q_CONNECT_ANON q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
+
+       /* grab the samr open policy */
+       if(!samr_io_q_connect_anon("", &q_u, data, 0))
+               return False;
+
+       /* construct reply.  always indicate success */
+       if(!samr_reply_connect_anon(&q_u, rdata))
+               return False;
+
+       return True;
+}
 
 /*******************************************************************
  samr_reply_connect
  ********************************************************************/
-static void samr_reply_connect(SAMR_Q_CONNECT *q_u,
-                               prs_struct *rdata)
+static BOOL samr_reply_connect(SAMR_Q_CONNECT *q_u, prs_struct *rdata)
 {
        SAMR_R_CONNECT r_u;
        BOOL pol_open = False;
@@ -1211,31 +1975,125 @@ static void samr_reply_connect(SAMR_Q_CONNECT *q_u,
        DEBUG(5,("samr_connect: %d\n", __LINE__));
 
        /* store the response in the SMB stream */
-       samr_io_r_connect("", &r_u, rdata, 0);
+       if(!samr_io_r_connect("", &r_u, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_connect: %d\n", __LINE__));
 
+       return True;
 }
 
 /*******************************************************************
  api_samr_connect
  ********************************************************************/
-static void api_samr_connect( int uid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_connect(pipes_struct *p)
 {
        SAMR_Q_CONNECT q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr open policy */
-       samr_io_q_connect("", &q_u, data, 0);
+       if(!samr_io_q_connect("", &q_u, data, 0))
+               return False;
 
        /* construct reply.  always indicate success */
-       samr_reply_connect(&q_u, rdata);
+       if(!samr_reply_connect(&q_u, rdata))
+               return False;
+
+       return True;
+}
+
+/**********************************************************************
+ api_reply_lookup_domain
+ **********************************************************************/
+static BOOL samr_reply_lookup_domain(SAMR_Q_LOOKUP_DOMAIN* q_u, prs_struct* rdata)
+{
+  SAMR_R_LOOKUP_DOMAIN r_u;
+  
+  r_u.status = 0x0;
+  if (r_u.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->connect_pol)) == -1))
+       {
+               r_u.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
+               DEBUG(5,("samr_reply_lookup_domain: invalid handle\n"));
+       }
+  
+  /* assume the domain name sent is our global_myname and 
+     send global_sam_sid */
+  init_samr_r_lookup_domain(&r_u, &global_sam_sid, r_u.status);
+  
+       if(!samr_io_r_lookup_domain("", &r_u, rdata, 0))
+               return False;
+
+  DEBUG(5,("samr_reply_lookup_domain: %d\n", __LINE__));
+       return True; 
+}
+  
+/**********************************************************************
+ api_samr_lookup_domain
+ **********************************************************************/
+static BOOL api_samr_lookup_domain(pipes_struct *p)
+{
+       SAMR_Q_LOOKUP_DOMAIN q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
+  
+       if(!samr_io_q_lookup_domain("", &q_u, data, 0))
+               return False;
+       
+       if(!samr_reply_lookup_domain(&q_u, rdata))
+               return False;
+       
+       return True;
+}
+
+/**********************************************************************
+ samr_reply_enum_domains
+ **********************************************************************/
+static BOOL samr_reply_enum_domains(SAMR_Q_ENUM_DOMAINS* q_u, prs_struct* rdata)
+{
+  SAMR_R_ENUM_DOMAINS r_u;
+  fstring dom[2];
+
+  fstrcpy(dom[0],global_myname);
+  fstrcpy(dom[1],"Builtin");
+  r_u.status = 0;
+   
+  init_samr_r_enum_domains(&r_u, q_u->start_idx, dom, 2); 
+  if(!samr_io_r_enum_domains("", &r_u, rdata, 0)) {
+               free(r_u.sam);
+               free(r_u.uni_dom_name);
+               return False;
+       }
+
+  free(r_u.sam);
+  free(r_u.uni_dom_name);
+
+       return True;
+}
+
+/**********************************************************************
+ api_samr_enum_domains
+ **********************************************************************/
+static BOOL api_samr_enum_domains(pipes_struct *p)
+{
+       SAMR_Q_ENUM_DOMAINS q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
+
+       if(!samr_io_q_enum_domains("", &q_u, data, 0))
+               return False;
+       
+       if(!samr_reply_enum_domains(&q_u, rdata))
+               return False;
+       
+       return True;
 }
 
 /*******************************************************************
  samr_reply_open_alias
  ********************************************************************/
-static void samr_reply_open_alias(SAMR_Q_OPEN_ALIAS *q_u,
-                               prs_struct *rdata)
+static BOOL samr_reply_open_alias(SAMR_Q_OPEN_ALIAS *q_u, prs_struct *rdata)
 {
        SAMR_R_OPEN_ALIAS r_u;
        BOOL pol_open = False;
@@ -1264,25 +2122,32 @@ static void samr_reply_open_alias(SAMR_Q_OPEN_ALIAS *q_u,
        DEBUG(5,("samr_open_alias: %d\n", __LINE__));
 
        /* store the response in the SMB stream */
-       samr_io_r_open_alias("", &r_u, rdata, 0);
+       if(!samr_io_r_open_alias("", &r_u, rdata, 0))
+               return False;
 
        DEBUG(5,("samr_open_alias: %d\n", __LINE__));
-
+       
+       return True;
 }
 
 /*******************************************************************
  api_samr_open_alias
  ********************************************************************/
-static void api_samr_open_alias( int uid, prs_struct *data, prs_struct *rdata)
-                                
+static BOOL api_samr_open_alias(pipes_struct *p)
 {
        SAMR_Q_OPEN_ALIAS q_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
        /* grab the samr open policy */
-       samr_io_q_open_alias("", &q_u, data, 0);
+       if(!samr_io_q_open_alias("", &q_u, data, 0))
+               return False;
 
        /* construct reply.  always indicate success */
-       samr_reply_open_alias(&q_u, rdata);
+       if(!samr_reply_open_alias(&q_u, rdata))
+               return False;
+
+       return True;
 }
 
 /*******************************************************************
@@ -1292,6 +2157,7 @@ static struct api_struct api_samr_cmds [] =
 {
        { "SAMR_CLOSE_HND"        , SAMR_CLOSE_HND        , api_samr_close_hnd        },
        { "SAMR_CONNECT"          , SAMR_CONNECT          , api_samr_connect          },
+       { "SAMR_CONNECT_ANON"     , SAMR_CONNECT_ANON     , api_samr_connect_anon     },
        { "SAMR_ENUM_DOM_USERS"   , SAMR_ENUM_DOM_USERS   , api_samr_enum_dom_users   },
        { "SAMR_ENUM_DOM_GROUPS"  , SAMR_ENUM_DOM_GROUPS  , api_samr_enum_dom_groups  },
        { "SAMR_ENUM_DOM_ALIASES" , SAMR_ENUM_DOM_ALIASES , api_samr_enum_dom_aliases },
@@ -1299,22 +2165,28 @@ static struct api_struct api_samr_cmds [] =
        { "SAMR_LOOKUP_NAMES"     , SAMR_LOOKUP_NAMES     , api_samr_lookup_names     },
        { "SAMR_OPEN_USER"        , SAMR_OPEN_USER        , api_samr_open_user        },
        { "SAMR_QUERY_USERINFO"   , SAMR_QUERY_USERINFO   , api_samr_query_userinfo   },
+       { "SAMR_QUERY_DOMAIN_INFO", SAMR_QUERY_DOMAIN_INFO, api_samr_query_dom_info        },
        { "SAMR_QUERY_USERGROUPS" , SAMR_QUERY_USERGROUPS , api_samr_query_usergroups },
        { "SAMR_QUERY_DISPINFO"   , SAMR_QUERY_DISPINFO   , api_samr_query_dispinfo   },
        { "SAMR_QUERY_ALIASINFO"  , SAMR_QUERY_ALIASINFO  , api_samr_query_aliasinfo  },
        { "SAMR_0x32"             , 0x32                  , api_samr_unknown_32       },
        { "SAMR_UNKNOWN_12"       , SAMR_UNKNOWN_12       , api_samr_unknown_12       },
+       { "SAMR_UNKNOWN_38"       , SAMR_UNKNOWN_38       , api_samr_unknown_38       },
+       { "SAMR_CHGPASSWD_USER"   , SAMR_CHGPASSWD_USER   , api_samr_chgpasswd_user   },
        { "SAMR_OPEN_ALIAS"       , SAMR_OPEN_ALIAS       , api_samr_open_alias       },
        { "SAMR_OPEN_DOMAIN"      , SAMR_OPEN_DOMAIN      , api_samr_open_domain      },
        { "SAMR_UNKNOWN_3"        , SAMR_UNKNOWN_3        , api_samr_unknown_3        },
-    { NULL                    , 0                     , NULL                      }
+       { "SAMR_UNKNOWN_2C"       , SAMR_UNKNOWN_2C       , api_samr_unknown_2c       },
+       { "SAMR_LOOKUP_DOMAIN"    , SAMR_LOOKUP_DOMAIN    , api_samr_lookup_domain    },
+       { "SAMR_ENUM_DOMAINS"     , SAMR_ENUM_DOMAINS     , api_samr_enum_domains     },
+       { NULL                    , 0                     , NULL                      }
 };
 
 /*******************************************************************
  receives a samr pipe and responds.
  ********************************************************************/
-BOOL api_samr_rpc(pipes_struct *p, prs_struct *data)
+BOOL api_samr_rpc(pipes_struct *p)
 {
-    return api_rpcTNP(p, "api_samr_rpc", api_samr_cmds, data);
+       return api_rpcTNP(p, "api_samr_rpc", api_samr_cmds);
 }
-
+#undef OLD_NTDOMAIN