RIP BOOL. Convert BOOL -> bool. I found a few interesting
[nivanova/samba-autobuild/.git] / source3 / rpc_server / srv_samr.c
index 7891fc16dc1ea6eb8e37b8ae742b0e01c8a292df..a1deac083df45bd17fc9a1c44204a0f8b6ab700a 100644 (file)
@@ -1,16 +1,20 @@
-#define OLD_NTDOMAIN 1
 /* 
- *  Unix SMB/Netbios implementation.
- *  Version 1.9.
+ *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
  *  Copyright (C) Andrew Tridgell              1992-1997,
  *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
- *  Copyright (C) Paul Ashton                       1997.
- *  Copyright (C) Hewlett-Packard Company           1999.
+ *  Copyright (C) Paul Ashton                       1997,
+ *  Copyright (C) Marc Jacobsen                            1999,
+ *  Copyright (C) Jean François Micouleau      1998-2001,
+ *  Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2002-2003.
+ *     
+ *     Split into interface and implementation modules by, 
+ *
+ *  Copyright (C) Jeremy Allison                    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
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
  *  
  *  This program is distributed in the hope that it will be useful,
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "includes.h"
-
-extern int DEBUGLEVEL;
+/*
+ * This is the interface to the SAMR code.
+ */
 
-extern fstring global_myworkgroup;
-extern pstring global_myname;
-extern DOM_SID global_sam_sid;
+#include "includes.h"
 
-extern rid_name domain_group_rids[];
-extern rid_name domain_alias_rids[];
-extern rid_name builtin_alias_rids[];
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_SRV
 
 /*******************************************************************
-  This next function should be replaced with something that
-  dynamically returns the correct user info..... JRA.
+ api_samr_close_hnd
  ********************************************************************/
 
-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)
+static bool api_samr_close_hnd(pipes_struct *p)
 {
-       void *vp = NULL;
-       struct sam_passwd *pwd = NULL;
-
-       (*num_entries) = 0;
-       (*total_entries) = 0;
+       SAMR_Q_CLOSE_HND q_u;
+       SAMR_R_CLOSE_HND r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       if (pw_buf == NULL) return False;
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       vp = startsmbpwent(False);
-       if (!vp) {
-               DEBUG(0, ("get_sampwd_entries: Unable to open SMB password database.\n"));
+       if(!samr_io_q_close_hnd("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_close_hnd: unable to unmarshall SAMR_Q_CLOSE_HND.\n"));
                return False;
        }
 
-       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) {
-                       memcpy( pw_buf[(*num_entries)].nt_pwd , pwd->smb_nt_passwd, 16);
-               }
-
-               pw_buf[(*num_entries)].acb_info = (uint16)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 || (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));
-               }
+       r_u.status = _samr_close_hnd(p, &q_u, &r_u);
 
-               (*total_entries)++;
+       /* store the response in the SMB stream */
+       if(!samr_io_r_close_hnd("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_close_hnd: unable to marshall SAMR_R_CLOSE_HND.\n"));
+               return False;
        }
 
-       endsmbpwent(vp);
-
-       return (*num_entries) > 0;
+       return True;
 }
 
 /*******************************************************************
- 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;
-}
+ api_samr_open_domain
+ ********************************************************************/
 
-/*******************************************************************
- 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 bool api_samr_open_domain(pipes_struct *p)
 {
-       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"));
-
-       (*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;
-                       }
-               }
-       }
-
-       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 = 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);
-                       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;
+       SAMR_Q_OPEN_DOMAIN q_u;
+       SAMR_R_OPEN_DOMAIN r_u;
 
-                       DEBUG(5, ("get_passwd_entries: entry idx %d user %s, rid 0x%x\n", (*num_entries), pwd->pw_name, pw_rid));
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-                       (*num_entries)++;
-                       (*total_entries)++;
-                       current_idx++;
-                       mapped_idx++;
-               }
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-               if (unmap_name == NULL) {
-                       /* done with 'aliases', go on to next UNIX user */
-                       orig_done = False;
-                       mapped_idx = 0;
-               }
+       if(!samr_io_q_open_domain("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_open_domain: unable to unmarshall SAMR_Q_OPEN_DOMAIN.\n"));
+               return False;
        }
 
-       if (pwd == NULL) {
-               /* totally done, reset everything */
-               endpwent();
-               current_idx = 0;
-               mapped_idx = 0;
+       r_u.status = _samr_open_domain(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_open_domain("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_open_domain: unable to marshall SAMR_R_OPEN_DOMAIN.\n"));
+               return False;
        }
 
-       return (*num_entries) > 0;
+       return True;
 }
 
 /*******************************************************************
- samr_reply_unknown_1
+ api_samr_get_usrdom_pwinfo
  ********************************************************************/
-static BOOL samr_reply_close_hnd(SAMR_Q_CLOSE_HND *q_u,
-                               prs_struct *rdata)
+
+static bool api_samr_get_usrdom_pwinfo(pipes_struct *p)
 {
-       SAMR_R_CLOSE_HND r_u;
+       SAMR_Q_GET_USRDOM_PWINFO q_u;
+       SAMR_R_GET_USRDOM_PWINFO r_u;
+
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       /* set up the SAMR unknown_1 response */
-       memset((char *)r_u.pol.data, '\0', POL_HND_SIZE);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* close the policy handle */
-       if (close_lsa_policy_hnd(&(q_u->pol)))
-       {
-               r_u.status = 0;
-       }
-       else
-       {
-               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_INVALID;
+       if(!samr_io_q_get_usrdom_pwinfo("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_get_usrdom_pwinfo: unable to unmarshall SAMR_Q_GET_USRDOM_PWINFO.\n"));
+               return False;
        }
 
-       DEBUG(5,("samr_reply_close_hnd: %d\n", __LINE__));
+       r_u.status = _samr_get_usrdom_pwinfo(p, &q_u, &r_u);
 
-       /* store the response in the SMB stream */
-       if(!samr_io_r_close_hnd("", &r_u, rdata, 0))
+       if(!samr_io_r_get_usrdom_pwinfo("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_get_usrdom_pwinfo: unable to marshall SAMR_R_GET_USRDOM_PWINFO.\n"));
                return False;
-
-       DEBUG(5,("samr_reply_close_hnd: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_close_hnd
+ api_samr_set_sec_obj
  ********************************************************************/
-static BOOL api_samr_close_hnd(pipes_struct *p)
+
+static bool api_samr_set_sec_obj(pipes_struct *p)
 {
-       SAMR_Q_CLOSE_HND q_u;
-       prs_struct *data = &p->in_data.data;
+       SAMR_Q_SET_SEC_OBJ q_u;
+       SAMR_R_SET_SEC_OBJ r_u;
+       
+       prs_struct *data  = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
-
-       /* grab the samr unknown 1 */
-       if(!samr_io_q_close_hnd("", &q_u, data, 0))
+       
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+       
+       if(!samr_io_q_set_sec_obj("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_set_sec_obj: unable to unmarshall SAMR_Q_SET_SEC_OBJ.\n"));
                return False;
+       }
 
-       /* construct reply.  always indicate success */
-       if(!samr_reply_close_hnd(&q_u, rdata))
-               return False;
+       r_u.status = _samr_set_sec_obj(p, &q_u, &r_u);
 
+       if(!samr_io_r_set_sec_obj("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_set_sec_obj: unable to marshall SAMR_R_SET_SEC_OBJ.\n"));
+               return False;
+       }
+       
        return True;
 }
 
-
 /*******************************************************************
- samr_reply_open_domain
+ api_samr_query_sec_obj
  ********************************************************************/
-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;
 
-       r_u.status = 0x0;
-
-       /* find the connection policy handle. */
-       if (r_u.status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->connect_pol)) == -1))
-       {
-               r_u.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
-       }
+static bool api_samr_query_sec_obj(pipes_struct *p)
+{
+       SAMR_Q_QUERY_SEC_OBJ q_u;
+       SAMR_R_QUERY_SEC_OBJ r_u;
 
-       /* get a (unique) handle.  open a policy on it. */
-       if (r_u.status == 0x0 && !(pol_open = open_lsa_policy_hnd(&(r_u.domain_pol))))
-       {
-               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
-       }
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       /* associate the domain SID with the (unique) handle. */
-       if (r_u.status == 0x0 && !set_lsa_policy_samr_sid(&(r_u.domain_pol), &(q_u->dom_sid.sid)))
-       {
-               /* oh, whoops.  don't know what error message to return, here */
-               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
-       }
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       if (r_u.status != 0 && pol_open)
-       {
-               close_lsa_policy_hnd(&(r_u.domain_pol));
+       if(!samr_io_q_query_sec_obj("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_query_sec_obj: unable to unmarshall SAMR_Q_QUERY_SEC_OBJ.\n"));
+               return False;
        }
 
-       DEBUG(5,("samr_open_domain: %d\n", __LINE__));
+       r_u.status = _samr_query_sec_obj(p, &q_u, &r_u);
 
-       /* store the response in the SMB stream */
-       if(!samr_io_r_open_domain("", &r_u, rdata, 0))
+       if(!samr_io_r_query_sec_obj("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_sec_obj: unable to marshall SAMR_R_QUERY_SEC_OBJ.\n"));
                return False;
-
-       DEBUG(5,("samr_open_domain: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_open_domain
+ api_samr_enum_dom_users
  ********************************************************************/
-static BOOL api_samr_open_domain(pipes_struct *p)
+
+static bool api_samr_enum_dom_users(pipes_struct *p)
 {
-       SAMR_Q_OPEN_DOMAIN q_u;
+       SAMR_Q_ENUM_DOM_USERS q_u;
+       SAMR_R_ENUM_DOM_USERS r_u;
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
        /* grab the samr open */
-       if(!samr_io_q_open_domain("", &q_u, data, 0))
+       if(!samr_io_q_enum_dom_users("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_enum_dom_users: unable to unmarshall SAMR_Q_ENUM_DOM_USERS.\n"));
                return False;
+       }
+
+       r_u.status = _samr_enum_dom_users(p, &q_u, &r_u);
 
-       /* construct reply.  always indicate success */
-       if(!samr_reply_open_domain(&q_u, rdata))
+       /* store the response in the SMB stream */
+       if(!samr_io_r_enum_dom_users("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_enum_dom_users: unable to marshall SAMR_R_ENUM_DOM_USERS.\n"));
                return False;
+       }
 
        return True;
 }
 
-
 /*******************************************************************
- samr_reply_unknown_2c
+ api_samr_enum_dom_groups
  ********************************************************************/
-static BOOL samr_reply_unknown_2c(SAMR_Q_UNKNOWN_2C *q_u,
-                               prs_struct *rdata)
+
+static bool api_samr_enum_dom_groups(pipes_struct *p)
 {
-       SAMR_R_UNKNOWN_2C r_u;
-       uint32 status = 0x0;
+       SAMR_Q_ENUM_DOM_GROUPS q_u;
+       SAMR_R_ENUM_DOM_GROUPS r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       /* 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;
-       }
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* find the user's rid */
-       if ((status == 0x0) && (get_lsa_policy_samr_rid(&(q_u->user_pol)) == 0xffffffff))
-       {
-               status = NT_STATUS_OBJECT_TYPE_MISMATCH;
+       /* grab the samr open */
+       if(!samr_io_q_enum_dom_groups("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_enum_dom_groups: unable to unmarshall SAMR_Q_ENUM_DOM_GROUPS.\n"));
+               return False;
        }
 
-       init_samr_r_unknown_2c(&r_u, status);
-
-       DEBUG(5,("samr_unknown_2c: %d\n", __LINE__));
+       r_u.status = _samr_enum_dom_groups(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!samr_io_r_unknown_2c("", &r_u, rdata, 0))
+       if(!samr_io_r_enum_dom_groups("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_enum_dom_groups: unable to marshall SAMR_R_ENUM_DOM_GROUPS.\n"));
                return False;
-
-       DEBUG(5,("samr_unknown_2c: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_unknown_2c
+ api_samr_enum_dom_aliases
  ********************************************************************/
-static BOOL api_samr_unknown_2c(pipes_struct *p)
+
+static bool api_samr_enum_dom_aliases(pipes_struct *p)
 {
-       SAMR_Q_UNKNOWN_2C q_u;
+       SAMR_Q_ENUM_DOM_ALIASES q_u;
+       SAMR_R_ENUM_DOM_ALIASES r_u;
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
+       
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
        /* grab the samr open */
-       if(!samr_io_q_unknown_2c("", &q_u, data, 0))
+       if(!samr_io_q_enum_dom_aliases("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_enum_dom_aliases: unable to unmarshall SAMR_Q_ENUM_DOM_ALIASES.\n"));
                return False;
+       }
 
-       /* construct reply.  always indicate success */
-       if(!samr_reply_unknown_2c(&q_u, rdata))
+       r_u.status = _samr_enum_dom_aliases(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_enum_dom_aliases("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_enum_dom_aliases: unable to marshall SAMR_R_ENUM_DOM_ALIASES.\n"));
                return False;
+       }
 
        return True;
 }
 
-
 /*******************************************************************
- samr_reply_unknown_3
+ api_samr_query_dispinfo
  ********************************************************************/
-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];
-       uint32 rid;
-       uint32 status;
 
-       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 && (rid = get_lsa_policy_samr_rid(&(q_u->user_pol))) == 0xffffffff)
-       {
-               status = NT_STATUS_OBJECT_TYPE_MISMATCH;
-       }
-
-       if (status == 0x0)
-       {
-               DOM_SID user_sid;
-               DOM_SID everyone_sid;
-
-               user_sid = global_sam_sid;
-
-               SMB_ASSERT_ARRAY(user_sid.sub_auths, user_sid.num_auths+1);
+static bool api_samr_query_dispinfo(pipes_struct *p)
+{
+       SAMR_Q_QUERY_DISPINFO q_u;
+       SAMR_R_QUERY_DISPINFO r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-               /*
-                * Add the user RID.
-                */
-               user_sid.sub_auths[user_sid.num_auths++] = rid;
-               
-                       string_to_sid(&everyone_sid, "S-1-1");
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-                       /* 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);
+       if(!samr_io_q_query_dispinfo("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_query_dispinfo: unable to unmarshall SAMR_Q_QUERY_DISPINFO.\n"));
+               return False;
        }
 
-       init_samr_r_unknown_3(&r_u,
-                               0x0001, 0x8004,
-                               0x00000014, 0x0002, 0x0070,
-                               2, sid, status);
-
-       DEBUG(5,("samr_unknown_3: %d\n", __LINE__));
+       r_u.status = _samr_query_dispinfo(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!samr_io_r_unknown_3("", &r_u, rdata, 0))
+       if(!samr_io_r_query_dispinfo("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_dispinfo: unable to marshall SAMR_R_QUERY_DISPINFO.\n"));
                return False;
-
-       DEBUG(5,("samr_unknown_3: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_unknown_3
+ api_samr_query_aliasinfo
  ********************************************************************/
-static BOOL api_samr_unknown_3(pipes_struct *p)
+
+static bool api_samr_query_aliasinfo(pipes_struct *p)
 {
-       SAMR_Q_UNKNOWN_3 q_u;
+       SAMR_Q_QUERY_ALIASINFO q_u;
+       SAMR_R_QUERY_ALIASINFO r_u;
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
        /* grab the samr open */
-       if(!samr_io_q_unknown_3("", &q_u, data, 0))
+       if(!samr_io_q_query_aliasinfo("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_query_aliasinfo: unable to unmarshall SAMR_Q_QUERY_ALIASINFO.\n"));
                return False;
+       }
 
-       /* construct reply.  always indicate success */
-       if(!samr_reply_unknown_3(&q_u, rdata))
-               return False;
+       r_u.status = _samr_query_aliasinfo(p, &q_u, &r_u);
 
+       /* store the response in the SMB stream */
+       if(!samr_io_r_query_aliasinfo("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_aliasinfo: unable to marshall SAMR_R_QUERY_ALIASINFO.\n"));
+               return False;
+       }
+  
        return True;
 }
 
-
 /*******************************************************************
samr_reply_enum_dom_users
api_samr_lookup_names
  ********************************************************************/
-static BOOL samr_reply_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_u,
-                               prs_struct *rdata)
+
+static bool api_samr_lookup_names(pipes_struct *p)
 {
-       SAMR_R_ENUM_DOM_USERS r_e;
-       SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
-       int num_entries;
-       int total_entries;
-       
-       ZERO_STRUCT(r_e);
+       SAMR_Q_LOOKUP_NAMES q_u;
+       SAMR_R_LOOKUP_NAMES r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       r_e.status = 0x0;
-       r_e.total_num_entries = 0;
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* 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;
+       /* grab the samr lookup names */
+       if(!samr_io_q_lookup_names("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_lookup_names: unable to unmarshall SAMR_Q_LOOKUP_NAMES.\n"));
+               return False;
        }
 
-       DEBUG(5,("samr_reply_enum_dom_users: %d\n", __LINE__));
-
-       become_root();
-       get_sampwd_entries(pass, 0, &total_entries, &num_entries, MAX_SAM_ENTRIES, q_u->acb_mask);
-       unbecome_root();
-
-       init_samr_r_enum_dom_users(&r_e, total_entries,
-                                  q_u->unknown_0, num_entries,
-                                  pass, r_e.status);
+       r_u.status = _samr_lookup_names(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!samr_io_r_enum_dom_users("", &r_e, rdata, 0))
+       if(!samr_io_r_lookup_names("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_lookup_names: unable to marshall SAMR_R_LOOKUP_NAMES.\n"));
                return False;
-
-       DEBUG(5,("samr_enum_dom_users: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_enum_dom_users
+ api_samr_chgpasswd_user
  ********************************************************************/
-static BOOL api_samr_enum_dom_users(pipes_struct *p)
+
+static bool api_samr_chgpasswd_user(pipes_struct *p)
 {
-       SAMR_Q_ENUM_DOM_USERS q_e;
+       SAMR_Q_CHGPASSWD_USER q_u;
+       SAMR_R_CHGPASSWD_USER r_u;
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       /* grab the samr open */
-       if(!samr_io_q_enum_dom_users("", &q_e, data, 0))
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       /* change password request */
+       if (!samr_io_q_chgpasswd_user("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_chgpasswd_user: Failed to unmarshall SAMR_Q_CHGPASSWD_USER.\n"));
                return False;
+       }
 
-       /* construct reply. */
-       if(!samr_reply_enum_dom_users(&q_e, rdata))
+       r_u.status = _samr_chgpasswd_user(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_chgpasswd_user("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_chgpasswd_user: Failed to marshall SAMR_R_CHGPASSWD_USER.\n" ));
                return False;
+       }
 
        return True;
 }
 
 /*******************************************************************
samr_reply_enum_dom_groups
api_samr_lookup_rids
  ********************************************************************/
-static BOOL samr_reply_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_u,
-                               prs_struct *rdata)
+
+static bool api_samr_lookup_rids(pipes_struct *p)
 {
-       SAMR_R_ENUM_DOM_GROUPS r_e;
-       SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
-       int num_entries;
-       BOOL got_grps;
-       char *dummy_group = "Domain Admins";
-       
-       ZERO_STRUCT(r_e);
+       SAMR_Q_LOOKUP_RIDS q_u;
+       SAMR_R_LOOKUP_RIDS r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       r_e.status = 0x0;
-       r_e.num_entries = 0;
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* 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;
+       /* grab the samr lookup names */
+       if(!samr_io_q_lookup_rids("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_lookup_rids: unable to unmarshall SAMR_Q_LOOKUP_RIDS.\n"));
+               return False;
        }
 
-       DEBUG(5,("samr_reply_enum_dom_groups: %d\n", __LINE__));
-
-       got_grps = True;
-       num_entries = 1;
-       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)
-       {
-               init_samr_r_enum_dom_groups(&r_e, q_u->start_idx, num_entries, pass, r_e.status);
-       }
+       r_u.status = _samr_lookup_rids(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!samr_io_r_enum_dom_groups("", &r_e, rdata, 0))
+       if(!samr_io_r_lookup_rids("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_lookup_rids: unable to marshall SAMR_R_LOOKUP_RIDS.\n"));
                return False;
-
-       DEBUG(5,("samr_enum_dom_groups: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_enum_dom_groups
+ api_samr_open_user
  ********************************************************************/
-static BOOL api_samr_enum_dom_groups(pipes_struct *p)
+
+static bool api_samr_open_user(pipes_struct *p)
 {
-       SAMR_Q_ENUM_DOM_GROUPS q_e;
+       SAMR_Q_OPEN_USER q_u;
+       SAMR_R_OPEN_USER r_u;
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       /* grab the samr open */
-       if(!samr_io_q_enum_dom_groups("", &q_e, data, 0))
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       if(!samr_io_q_open_user("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_open_user: unable to unmarshall SAMR_Q_OPEN_USER.\n"));
                return False;
+       }
+
+       r_u.status = _samr_open_user(p, &q_u, &r_u);
 
-       /* construct reply. */
-       if(!samr_reply_enum_dom_groups(&q_e, rdata))
+       /* store the response in the SMB stream */
+       if(!samr_io_r_open_user("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_open_user: unable to marshall SAMR_R_OPEN_USER.\n"));
                return False;
+       }
 
        return True;
 }
 
 /*******************************************************************
- samr_reply_enum_dom_aliases
+ api_samr_query_userinfo
  ********************************************************************/
-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 = 0;
-       DOM_SID sid;
-       fstring sid_str;
-       fstring sam_sid_str;
-       struct group *grp;
-       
-       ZERO_STRUCT(r_e);
 
-       /* find the policy handle.  open a policy on it. */
-       if (r_e.status == 0x0 && !get_lsa_policy_samr_sid(&q_u->pol, &sid))
-       {
-               r_e.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
-       }
-
-       sid_to_string(sid_str, &sid);
-       sid_to_string(sam_sid_str, &global_sam_sid);
+static bool api_samr_query_userinfo(pipes_struct *p)
+{
+       SAMR_Q_QUERY_USERINFO q_u;
+       SAMR_R_QUERY_USERINFO r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       DEBUG(5,("samr_reply_enum_dom_aliases: sid %s\n", sid_str));
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* 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++;
-               }
+       if(!samr_io_q_query_userinfo("", &q_u, data, 0)){
+               DEBUG(0,("api_samr_query_userinfo: unable to unmarshall SAMR_Q_QUERY_USERINFO.\n"));
+               return False;
        }
-       else if (strequal(sid_str, sam_sid_str))
-       {
-               char *name;
-               char *sep;
-
-               sep = lp_winbind_separator();
-
-               /* 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;
-
-                       /* Don't return winbind groups as they are not local! */
-
-                       if (strchr(name, *sep) != NULL) {
-                               continue;
-                       }
 
-                       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);
+       r_u.status = _samr_query_userinfo(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!samr_io_r_enum_dom_aliases("", &r_e, rdata, 0))
+       if(!samr_io_r_query_userinfo("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_userinfo: unable to marshall SAMR_R_QUERY_USERINFO.\n"));
                return False;
-
-       DEBUG(5,("samr_enum_dom_aliases: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_enum_dom_aliases
+ api_samr_query_usergroups
  ********************************************************************/
-static BOOL api_samr_enum_dom_aliases(pipes_struct *p)
+
+static bool api_samr_query_usergroups(pipes_struct *p)
 {
-       SAMR_Q_ENUM_DOM_ALIASES q_e;
+       SAMR_Q_QUERY_USERGROUPS q_u;
+       SAMR_R_QUERY_USERGROUPS r_u;
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
-       
-       ZERO_STRUCT(q_e);
 
-       /* grab the samr open */
-       if(!samr_io_q_enum_dom_aliases("", &q_e, data, 0))
-               return False;
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* construct reply. */
-       if(!samr_reply_enum_dom_aliases(&q_e, rdata))
+       if(!samr_io_q_query_usergroups("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_query_usergroups: unable to unmarshall SAMR_Q_QUERY_USERGROUPS.\n"));
                return False;
-
-       return True;
-}
-
-
-/*******************************************************************
- samr_reply_query_dispinfo
- ********************************************************************/
-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 = 0;
-       int total_entries = 0;
-       BOOL got_pwds;
-       uint16 switch_level = 0x0;
-
-       ZERO_STRUCT(r_e);
-
-       DEBUG(5,("samr_reply_query_dispinfo: %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;
-               DEBUG(5,("samr_reply_query_dispinfo: invalid handle\n"));
-       }
-
-       if (r_e.status == 0x0)
-       {
-         /* 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)
-               {
-                       case 0x1:
-                       {
-                       
-                               /* query disp info is for users */
-                               ZERO_STRUCT (info1);
-                               switch_level = 0x1;
-                               init_sam_info_1(&info1, ACB_NORMAL,
-                                       q_u->start_idx, num_entries, pass);
-
-                               ctr.sam.info1 = &info1;
-
-                               break;
-                       }
-                       case 0x2:
-                       {
-                               /* query disp info is for servers */
-                               ZERO_STRUCT (info2);
-                               switch_level = 0x2;
-                               init_sam_info_2(&info2, ACB_WSTRUST,
-                                       q_u->start_idx, num_entries, pass);
-
-                               ctr.sam.info2 = &info2;
-
-                               break;
-                       }
-               }
        }
 
-       /* more left - set resume handle */
-       if(total_entries > num_entries)
-         {
-           r_e.status = 0x105;
-         }
-
-       if (r_e.status == 0 || r_e.status == 0x105)
-       {
-         init_samr_r_query_dispinfo(&r_e, switch_level, &ctr, r_e.status);
-       }
+       r_u.status = _samr_query_usergroups(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!samr_io_r_query_dispinfo("", &r_e, rdata, 0))
+       if(!samr_io_r_query_usergroups("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_usergroups: unable to marshall SAMR_R_QUERY_USERGROUPS.\n"));
                return False;
-
-       DEBUG(5,("samr_query_dispinfo: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_query_dispinfo
+ api_samr_query_domain_info
  ********************************************************************/
-static BOOL api_samr_query_dispinfo(pipes_struct *p)
+
+static bool api_samr_query_domain_info(pipes_struct *p)
 {
-       SAMR_Q_QUERY_DISPINFO q_e;
+       SAMR_Q_QUERY_DOMAIN_INFO q_u;
+       SAMR_R_QUERY_DOMAIN_INFO r_u;
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       /* grab the samr open */
-       if(!samr_io_q_query_dispinfo("", &q_e, data, 0))
-               return False;
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* construct reply. */
-       if(!samr_reply_query_dispinfo(&q_e, rdata))
+       if(!samr_io_q_query_domain_info("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_query_domain_info: unable to unmarshall SAMR_Q_QUERY_DOMAIN_INFO.\n"));
                return False;
+       }
 
-       return True;
-}
-
+       r_u.status = _samr_query_domain_info(p, &q_u, &r_u);
 
-/*******************************************************************
- samr_reply_query_aliasinfo
- ********************************************************************/
-static BOOL samr_reply_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_u,
-                               prs_struct *rdata)
-{
-  SAMR_R_QUERY_ALIASINFO r_e;
-  fstring alias_desc = "Local Unix group";
-  fstring alias="";
-  enum SID_NAME_USE 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(!local_lookup_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))
+       /* store the response in the SMB stream */
+       if(!samr_io_r_query_domain_info("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_domain_info: unable to marshall SAMR_R_QUERY_DOMAIN_INFO.\n"));
                return False;
-  
-  DEBUG(5,("samr_query_aliasinfo: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_query_aliasinfo
+ api_samr_create_user
  ********************************************************************/
-static BOOL api_samr_query_aliasinfo(pipes_struct *p)
+
+static bool api_samr_create_user(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 */
-       if(!samr_io_q_query_aliasinfo("", &q_e, data, 0))
+       SAMR_Q_CREATE_USER q_u;
+       SAMR_R_CREATE_USER r_u;
+
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       /* grab the samr create user */
+       if (!samr_io_q_create_user("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_create_user: Unable to unmarshall SAMR_Q_CREATE_USER.\n"));
                return False;
+       }
 
-       /* construct reply. */
-       if(!samr_reply_query_aliasinfo(&q_e, rdata))
+       r_u.status=_samr_create_user(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_create_user("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_create_user: Unable to marshall SAMR_R_CREATE_USER.\n"));
                return False;
+       }
 
        return True;
 }
 
-
 /*******************************************************************
- samr_reply_lookup_ids
+ api_samr_connect_anon
  ********************************************************************/
-static BOOL samr_reply_lookup_ids(SAMR_Q_LOOKUP_IDS *q_u,
-                               prs_struct *rdata)
-{
-       uint32 rid[MAX_SAM_ENTRIES];
-       uint32 status     = 0;
-       int num_rids = q_u->num_sids1;
-
-       SAMR_R_LOOKUP_IDS r_u;
-
-       DEBUG(5,("samr_lookup_ids: %d\n", __LINE__));
-
-       if (num_rids > MAX_SAM_ENTRIES)
-       {
-               num_rids = MAX_SAM_ENTRIES;
-               DEBUG(5,("samr_lookup_ids: truncating entries to %d\n", num_rids));
-       }
 
-#if 0
-       int i;
-       SMB_ASSERT_ARRAY(q_u->uni_user_name, num_rids);
-
-       for (i = 0; i < num_rids && status == 0; i++)
-       {
-               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));
+static bool api_samr_connect_anon(pipes_struct *p)
+{
+       SAMR_Q_CONNECT_ANON q_u;
+       SAMR_R_CONNECT_ANON r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-               /* find the user account */
-               become_root();
-               sam_pass = get_smb21pwd_entry(user_name, 0);
-               unbecome_root();
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-               if (sam_pass == NULL)
-               {
-                       status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
-                       rid[i] = 0;
-               }
-               else
-               {
-                       rid[i] = sam_pass->user_rid;
-               }
+       /* grab the samr open policy */
+       if(!samr_io_q_connect_anon("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_connect_anon: unable to unmarshall SAMR_Q_CONNECT_ANON.\n"));
+               return False;
        }
-#endif
 
-       num_rids = 1;
-       rid[0] = BUILTIN_ALIAS_RID_USERS;
-
-       init_samr_r_lookup_ids(&r_u, num_rids, rid, status);
+       r_u.status = _samr_connect_anon(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!samr_io_r_lookup_ids("", &r_u, rdata, 0))
+       if(!samr_io_r_connect_anon("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_connect_anon: unable to marshall SAMR_R_CONNECT_ANON.\n"));
                return False;
-
-       DEBUG(5,("samr_lookup_ids: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_lookup_ids
+ api_samr_connect
  ********************************************************************/
-static BOOL api_samr_lookup_ids(pipes_struct *p)
+
+static bool api_samr_connect(pipes_struct *p)
 {
-       SAMR_Q_LOOKUP_IDS q_u;
+       SAMR_Q_CONNECT q_u;
+       SAMR_R_CONNECT r_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))
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       /* grab the samr open policy */
+       if(!samr_io_q_connect("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_connect: unable to unmarshall SAMR_Q_CONNECT.\n"));
                return False;
+       }
 
-       /* construct reply.  always indicate success */
-       if(!samr_reply_lookup_ids(&q_u, rdata))
+       r_u.status = _samr_connect(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_connect("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_connect: unable to marshall SAMR_R_CONNECT.\n"));
                return False;
+       }
 
        return True;
 }
 
 /*******************************************************************
- samr_reply_lookup_names
+ api_samr_connect4
  ********************************************************************/
 
-static BOOL samr_reply_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
-                                   prs_struct *rdata)
+static bool api_samr_connect4(pipes_struct *p)
 {
-  uint32 rid[MAX_SAM_ENTRIES];
-  enum SID_NAME_USE 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;
+       SAMR_Q_CONNECT4 q_u;
+       SAMR_R_CONNECT4 r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-    fstrcpy(name, dos_unistrn2(q_u->uni_name[i].buffer,
-                              q_u->uni_name[i].uni_str_len));
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-    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]);
-         status = 0;
+       /* grab the samr open policy */
+       if(!samr_io_q_connect4("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_connect4: unable to unmarshall SAMR_Q_CONNECT4.\n"));
+               return False;
        }
-    }
-  }
 
-  init_samr_r_lookup_names(&r_u, num_rids, rid, type, status);
+       r_u.status = _samr_connect4(p, &q_u, &r_u);
 
-  /* 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__));
+       /* store the response in the SMB stream */
+       if(!samr_io_r_connect4("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_connect4: unable to marshall SAMR_R_CONNECT4.\n"));
+               return False;
+       }
 
-  return True;
+       return True;
 }
 
 /*******************************************************************
- api_samr_lookup_names
+ api_samr_chgpasswd_user3
  ********************************************************************/
 
-static BOOL api_samr_lookup_names(pipes_struct *p)
+static bool api_samr_chgpasswd_user3(pipes_struct *p)
 {
-       SAMR_Q_LOOKUP_NAMES q_u;
+       SAMR_Q_CHGPASSWD_USER3 q_u;
+       SAMR_R_CHGPASSWD_USER3 r_u;
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       memset(&q_u, '\0', sizeof(q_u));
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_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"));
+       /* change password request */
+       if (!samr_io_q_chgpasswd_user3("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_chgpasswd_user3: Failed to unmarshall SAMR_Q_CHGPASSWD_USER3.\n"));
                return False;
        }
 
-       /* construct reply.  always indicate success */
-       if(!samr_reply_lookup_names(&q_u, rdata))
+       r_u.status = _samr_chgpasswd_user3(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_chgpasswd_user3("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_chgpasswd_user3: Failed to marshall SAMR_R_CHGPASSWD_USER3.\n" ));
                return False;
+       }
 
        return True;
 }
 
 /*******************************************************************
- samr_reply_chgpasswd_user
+ api_samr_connect5
  ********************************************************************/
 
-static BOOL samr_reply_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
-                               prs_struct *rdata)
+static bool api_samr_connect5(pipes_struct *p)
 {
-       SAMR_R_CHGPASSWD_USER r_u;
-       uint32 status = 0x0;
-       fstring user_name;
-       fstring wks;
-
-       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));
+       SAMR_Q_CONNECT5 q_u;
+       SAMR_R_CONNECT5 r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       DEBUG(5,("samr_chgpasswd_user: user: %s wks: %s\n", user_name, wks));
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       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))
-       {
-               status = 0xC0000000 | NT_STATUS_WRONG_PASSWORD;
+       /* grab the samr open policy */
+       if(!samr_io_q_connect5("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_connect5: unable to unmarshall SAMR_Q_CONNECT5.\n"));
+               return False;
        }
 
-       init_samr_r_chgpasswd_user(&r_u, status);
+       r_u.status = _samr_connect5(p, &q_u, &r_u);
 
        /* 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" ));
+       if(!samr_io_r_connect5("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_connect5: unable to marshall SAMR_R_CONNECT5.\n"));
                return False;
        }
 
-       DEBUG(5,("samr_chgpasswd_user: %d\n", __LINE__));
        return True;
 }
 
-/*******************************************************************
- api_samr_chgpasswd_user
- ********************************************************************/
+/**********************************************************************
+ api_samr_lookup_domain
+ **********************************************************************/
 
-static BOOL api_samr_chgpasswd_user(pipes_struct *p)
+static bool api_samr_lookup_domain(pipes_struct *p)
 {
-       SAMR_Q_CHGPASSWD_USER q_u;
+       SAMR_Q_LOOKUP_DOMAIN q_u;
+       SAMR_R_LOOKUP_DOMAIN r_u;
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
+  
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* 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"));
+       if(!samr_io_q_lookup_domain("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_lookup_domain: Unable to unmarshall SAMR_Q_LOOKUP_DOMAIN.\n"));
                return False;
        }
 
-       /* 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"));
+       r_u.status = _samr_lookup_domain(p, &q_u, &r_u);
+       
+       if(!samr_io_r_lookup_domain("", &r_u, rdata, 0)){
+               DEBUG(0,("api_samr_lookup_domain: Unable to marshall SAMR_R_LOOKUP_DOMAIN.\n"));
                return False;
        }
-
+       
        return True;
 }
 
+/**********************************************************************
+ api_samr_enum_domains
+ **********************************************************************/
 
-/*******************************************************************
- samr_reply_unknown_38
- ********************************************************************/
-static BOOL samr_reply_unknown_38(SAMR_Q_UNKNOWN_38 *q_u, prs_struct *rdata)
+static bool api_samr_enum_domains(pipes_struct *p)
 {
-       SAMR_R_UNKNOWN_38 r_u;
+       SAMR_Q_ENUM_DOMAINS q_u;
+       SAMR_R_ENUM_DOMAINS r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
+  
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       DEBUG(5,("samr_unknown_38: %d\n", __LINE__));
+       if(!samr_io_q_enum_domains("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_enum_domains: Unable to unmarshall SAMR_Q_ENUM_DOMAINS.\n"));
+               return False;
+       }
 
-       init_samr_r_unknown_38(&r_u);
+       r_u.status = _samr_enum_domains(p, &q_u, &r_u);
 
-       /* store the response in the SMB stream */
-       if(!samr_io_r_unknown_38("", &r_u, rdata, 0))
+       if(!samr_io_r_enum_domains("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_enum_domains: Unable to marshall SAMR_R_ENUM_DOMAINS.\n"));
                return False;
-
-       DEBUG(5,("samr_unknown_38: %d\n", __LINE__));
+       }
+       
        return True;
 }
 
 /*******************************************************************
- api_samr_unknown_38
+ api_samr_open_alias
  ********************************************************************/
-static BOOL api_samr_unknown_38(pipes_struct *p)
+
+static bool api_samr_open_alias(pipes_struct *p)
 {
-       SAMR_Q_UNKNOWN_38 q_u;
+       SAMR_Q_OPEN_ALIAS q_u;
+       SAMR_R_OPEN_ALIAS r_u;
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       /* unknown 38 command */
-       if(!samr_io_q_unknown_38("", &q_u, data, 0))
-               return False;
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* construct reply.  always indicate success */
-       if(!samr_reply_unknown_38(&q_u, rdata))
+       /* grab the samr open policy */
+       if(!samr_io_q_open_alias("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_open_alias: Unable to unmarshall SAMR_Q_OPEN_ALIAS.\n"));
                return False;
+       }
+
+       r_u.status=_samr_open_alias(p, &q_u, &r_u);
 
+       /* store the response in the SMB stream */
+       if(!samr_io_r_open_alias("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_open_alias: Unable to marshall SAMR_R_OPEN_ALIAS.\n"));
+               return False;
+       }
+       
        return True;
 }
 
-
 /*******************************************************************
- samr_reply_unknown_12
+ api_samr_set_userinfo
  ********************************************************************/
-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;
 
-       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 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
-       {
-               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
-       }
+static bool api_samr_set_userinfo(pipes_struct *p)
+{
+       SAMR_Q_SET_USERINFO q_u;
+       SAMR_R_SET_USERINFO r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       if (status == 0x0)
-       {
-               int i;
-               if (num_gids > MAX_SAM_ENTRIES)
-               {
-                       num_gids = MAX_SAM_ENTRIES;
-                       DEBUG(5,("samr_unknown_12: truncating entries to %d\n", num_gids));
-               }
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-               for (i = 0; i < num_gids && status == 0; i++)
-               {
-                       fstrcpy(group_names[i], "dummy group");
-                       group_attrs[i] = 0x2;
+       if (!samr_io_q_set_userinfo("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_set_userinfo: Unable to unmarshall SAMR_Q_SET_USERINFO.\n"));
+               /* Fix for W2K SP2 */
+               /* what is that status-code ? - gd */
+               if (q_u.switch_value == 0x1a) {
+                       setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_INVALID_TAG));
+                       return True;
                }
+               return False;
        }
 
-       init_samr_r_unknown_12(&r_u, num_gids, group_names, group_attrs, status);
+       r_u.status = _samr_set_userinfo(p, &q_u, &r_u);
 
-       /* store the response in the SMB stream */
-       if(!samr_io_r_unknown_12("", &r_u, rdata, 0))
+       if(!samr_io_r_set_userinfo("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_set_userinfo: Unable to marshall SAMR_R_SET_USERINFO.\n"));
                return False;
-
-       DEBUG(5,("samr_unknown_12: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_unknown_12
+ api_samr_set_userinfo2
  ********************************************************************/
-static BOOL api_samr_unknown_12(pipes_struct *p)
+
+static bool api_samr_set_userinfo2(pipes_struct *p)
 {
-       SAMR_Q_UNKNOWN_12 q_u;
+       SAMR_Q_SET_USERINFO2 q_u;
+       SAMR_R_SET_USERINFO2 r_u;
+
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       /* grab the samr lookup names */
-       if(!samr_io_q_unknown_12("", &q_u, data, 0))
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       if (!samr_io_q_set_userinfo2("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_set_userinfo2: Unable to unmarshall SAMR_Q_SET_USERINFO2.\n"));
                return False;
+       }
 
-       /* construct reply.  always indicate success */
-       if(!samr_reply_unknown_12(&q_u, rdata))
+       r_u.status = _samr_set_userinfo2(p, &q_u, &r_u);
+
+       if(!samr_io_r_set_userinfo2("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_set_userinfo2: Unable to marshall SAMR_R_SET_USERINFO2.\n"));
                return False;
+       }
 
        return True;
 }
 
-
 /*******************************************************************
- samr_reply_open_user
+ api_samr_query_useraliases
  ********************************************************************/
-static BOOL samr_reply_open_user(SAMR_Q_OPEN_USER *q_u, prs_struct *rdata, int status)
-{
-       SAMR_R_OPEN_USER r_u;
-       struct sam_passwd *sam_pass;
-       BOOL pol_open = False;
-
-       /* set up the SAMR open_user response */
-       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 && (find_lsa_policy_by_hnd(&(q_u->domain_pol)) == -1))
-       {
-               r_u.status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
-       }
-
-       /* get a (unique) handle.  open a policy on it. */
-       if (r_u.status == 0x0 && !(pol_open = open_lsa_policy_hnd(&(r_u.user_pol))))
-       {
-               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
-       }
 
-       become_root();
-       sam_pass = getsam21pwrid(q_u->user_rid);
-       unbecome_root();
+static bool api_samr_query_useraliases(pipes_struct *p)
+{
+       SAMR_Q_QUERY_USERALIASES q_u;
+       SAMR_R_QUERY_USERALIASES r_u;
 
-       /* check that the RID exists in our domain. */
-       if (r_u.status == 0x0 && sam_pass == NULL)
-       {
-               r_u.status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
-       }
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       /* associate the RID with the (unique) handle. */
-       if (r_u.status == 0x0 && !set_lsa_policy_samr_rid(&(r_u.user_pol), q_u->user_rid))
-       {
-               /* oh, whoops.  don't know what error message to return, here */
-               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
-       }
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       if (r_u.status != 0 && pol_open)
-       {
-               close_lsa_policy_hnd(&(r_u.user_pol));
+       if (!samr_io_q_query_useraliases("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_query_useraliases:  Unable to unmarshall SAMR_Q_QUERY_USERALIASES.\n"));
+               return False;
        }
 
-       DEBUG(5,("samr_open_user: %d\n", __LINE__));
+       r_u.status = _samr_query_useraliases(p, &q_u, &r_u);
 
-       /* store the response in the SMB stream */
-       if(!samr_io_r_open_user("", &r_u, rdata, 0))
+       if (! samr_io_r_query_useraliases("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_useraliases:  Unable to nmarshall SAMR_R_QUERY_USERALIASES.\n"));
                return False;
-
-       DEBUG(5,("samr_open_user: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_open_user
+ api_samr_query_aliasmem
  ********************************************************************/
-static BOOL api_samr_open_user(pipes_struct *p)
+
+static bool api_samr_query_aliasmem(pipes_struct *p)
 {
-       SAMR_Q_OPEN_USER q_u;
+       SAMR_Q_QUERY_ALIASMEM q_u;
+       SAMR_R_QUERY_ALIASMEM r_u;
+
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       /* grab the samr unknown 22 */
-       if(!samr_io_q_open_user("", &q_u, data, 0))
-               return False;
-
-       /* construct reply.  always indicate success */
-       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;
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       if (!pdb_rid_is_user(user_rid))
-       {
-               DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
+       if (!samr_io_q_query_aliasmem("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_query_aliasmem: unable to unmarshall SAMR_Q_QUERY_ALIASMEM.\n"));
                return False;
        }
 
-       become_root();
-       smb_pass = getsmbpwrid(user_rid);
-       unbecome_root();
+       r_u.status = _samr_query_aliasmem(p, &q_u, &r_u);
 
-       if (smb_pass == NULL)
-       {
-               DEBUG(4,("User 0x%x not found\n", user_rid));
+       if (!samr_io_r_query_aliasmem("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_aliasmem: unable to marshall SAMR_R_QUERY_ALIASMEM.\n"));
                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
- *************************************************************************/
-static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
-{
-       NTTIME dummy_time;
-       struct sam_passwd *sam_pass;
-       LOGON_HRS hrs;
-       int i;
+/*******************************************************************
+ api_samr_query_groupmem
+ ********************************************************************/
+
+static bool api_samr_query_groupmem(pipes_struct *p)
+{
+       SAMR_Q_QUERY_GROUPMEM q_u;
+       SAMR_R_QUERY_GROUPMEM r_u;
+
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
+
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       if (!pdb_rid_is_user(user_rid))
-       {
-               DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
+       if (!samr_io_q_query_groupmem("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_query_groupmem: unable to unmarshall SAMR_Q_QUERY_GROUPMEM.\n"));
                return False;
        }
 
-       become_root();
-       sam_pass = getsam21pwrid(user_rid);
-       unbecome_root();
+       r_u.status = _samr_query_groupmem(p, &q_u, &r_u);
 
-       if (sam_pass == NULL)
-       {
-               DEBUG(4,("User 0x%x not found\n", user_rid));
+       if (!samr_io_r_query_groupmem("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_groupmem: unable to marshall SAMR_R_QUERY_GROUPMEM.\n"));
                return False;
        }
 
-       DEBUG(3,("User:[%s]\n", sam_pass->smb_name));
-
-       dummy_time.low  = 0xffffffff;
-       dummy_time.high = 0x7fffffff;
+       return True;
+}
 
-       DEBUG(5,("get_user_info_21 - TODO: convert unix times to NTTIMEs\n"));
+/*******************************************************************
+ api_samr_add_aliasmem
+ ********************************************************************/
 
-       /* create a LOGON_HRS structure */
-       hrs.len = sam_pass->hours_len;
-       SMB_ASSERT_ARRAY(hrs.hours, hrs.len);
-       for (i = 0; i < hrs.len; i++)
-       {
-               hrs.hours[i] = sam_pass->hours[i];
-       }
+static bool api_samr_add_aliasmem(pipes_struct *p)
+{
+       SAMR_Q_ADD_ALIASMEM q_u;
+       SAMR_R_ADD_ALIASMEM r_u;
 
-       init_sam_user_info21(id21,
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-                          &dummy_time, /* logon_time */
-                          &dummy_time, /* logoff_time */
-                          &dummy_time, /* kickoff_time */
-                          &dummy_time, /* pass_last_set_time */
-                          &dummy_time, /* pass_can_change_time */
-                          &dummy_time, /* pass_must_change_time */
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-                          sam_pass->smb_name, /* user_name */
-                          sam_pass->full_name, /* full_name */
-                          sam_pass->home_dir, /* home_dir */
-                          sam_pass->dir_drive, /* dir_drive */
-                          sam_pass->logon_script, /* logon_script */
-                          sam_pass->profile_path, /* profile_path */
-                          sam_pass->acct_desc, /* description */
-                          sam_pass->workstations, /* workstations user can log in from */
-                          sam_pass->unknown_str, /* don't know, yet */
-                          sam_pass->munged_dial, /* dialin info.  contains dialin path and tel no */
+       if (!samr_io_q_add_aliasmem("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_add_aliasmem: unable to unmarshall SAMR_Q_ADD_ALIASMEM.\n"));
+               return False;
+       }
 
-                          sam_pass->user_rid, /* RID user_id */
-                          sam_pass->group_rid, /* RID group_id */
-                      sam_pass->acct_ctrl,
+       r_u.status = _samr_add_aliasmem(p, &q_u, &r_u);
 
-                  sam_pass->unknown_3, /* unknown_3 */
-                      sam_pass->logon_divs, /* divisions per week */
-                          &hrs, /* logon hours */
-                      sam_pass->unknown_5,
-                      sam_pass->unknown_6);
+       if (!samr_io_r_add_aliasmem("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_add_aliasmem: unable to marshall SAMR_R_ADD_ALIASMEM.\n"));
+               return False;
+       }
 
        return True;
 }
 
 /*******************************************************************
- samr_reply_query_userinfo
+ api_samr_del_aliasmem
  ********************************************************************/
-static BOOL samr_reply_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
-                               prs_struct *rdata)
+
+static bool api_samr_del_aliasmem(pipes_struct *p)
 {
-       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 = 0x0;
-
-       DEBUG(5,("samr_reply_query_userinfo: %d\n", __LINE__));
-
-       /* search for the handle */
-       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
-       {
-               status = NT_STATUS_INVALID_HANDLE;
-       }
-
-       /* find the user's rid */
-       if (status == 0x0 && (rid = get_lsa_policy_samr_rid(&(q_u->pol))) == 0xffffffff)
-       {
-               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:
-                       {
-                               NTTIME expire;
-                               info = (void*)&id11;
-                               
-                               expire.low  = 0xffffffff;
-                               expire.high = 0x7fffffff;
-
-                               make_sam_user_info11(&id11, &expire, "BROOKFIELDS$", 0x03ef, 0x201, 0x0080);
-
-                               break;
-                       }
-#endif
-                       case 21:
-                       {
-                               info = (void*)&id21;
-                               status = get_user_info_21(&id21, rid) ? 0 : NT_STATUS_NO_SUCH_USER;
-                               break;
-                       }
-
-                       default:
-                       {
-                               status = NT_STATUS_INVALID_INFO_CLASS;
-
-                               break;
-                       }
-               }
-       }
+       SAMR_Q_DEL_ALIASMEM q_u;
+       SAMR_R_DEL_ALIASMEM r_u;
+
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       init_samr_r_query_userinfo(&r_u, q_u->switch_value, info, status);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* store the response in the SMB stream */
-       if(!samr_io_r_query_userinfo("", &r_u, rdata, 0))
+       if (!samr_io_q_del_aliasmem("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_del_aliasmem: unable to unmarshall SAMR_Q_DEL_ALIASMEM.\n"));
                return False;
+       }
+
+       r_u.status = _samr_del_aliasmem(p, &q_u, &r_u);
 
-       DEBUG(5,("samr_reply_query_userinfo: %d\n", __LINE__));
+       if (!samr_io_r_del_aliasmem("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_del_aliasmem: unable to marshall SAMR_R_DEL_ALIASMEM.\n"));
+               return False;
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_query_userinfo
+ api_samr_add_groupmem
  ********************************************************************/
-static BOOL api_samr_query_userinfo(pipes_struct *p)
+
+static bool api_samr_add_groupmem(pipes_struct *p)
 {
-       SAMR_Q_QUERY_USERINFO q_u;
+       SAMR_Q_ADD_GROUPMEM q_u;
+       SAMR_R_ADD_GROUPMEM r_u;
+
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       /* grab the samr unknown 24 */
-       if(!samr_io_q_query_userinfo("", &q_u, data, 0))
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       if (!samr_io_q_add_groupmem("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_add_groupmem: unable to unmarshall SAMR_Q_ADD_GROUPMEM.\n"));
                return False;
+       }
 
-       /* construct reply.  always indicate success */
-       if(!samr_reply_query_userinfo(&q_u, rdata))
+       r_u.status = _samr_add_groupmem(p, &q_u, &r_u);
+
+       if (!samr_io_r_add_groupmem("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_add_groupmem: unable to marshall SAMR_R_ADD_GROUPMEM.\n"));
                return False;
+       }
 
        return True;
 }
 
-
 /*******************************************************************
- samr_reply_query_usergroups
+ api_samr_del_groupmem
  ********************************************************************/
-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 sam_passwd *sam_pass;
-       DOM_GID *gids = NULL;
-       int num_groups = 0;
-       uint32 rid;
-
-       DEBUG(5,("samr_query_usergroups: %d\n", __LINE__));
-
-       /* find the policy handle.  open a policy on it. */
-       if (status == 0x0 && (find_lsa_policy_by_hnd(&(q_u->pol)) == -1))
-       {
-               status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
-       }
 
-       /* find the user's rid */
-       if (status == 0x0 && (rid = get_lsa_policy_samr_rid(&(q_u->pol))) == 0xffffffff)
-       {
-               status = NT_STATUS_OBJECT_TYPE_MISMATCH;
-       }
+static bool api_samr_del_groupmem(pipes_struct *p)
+{
+       SAMR_Q_DEL_GROUPMEM q_u;
+       SAMR_R_DEL_GROUPMEM r_u;
 
-       if (status == 0x0)
-       {
-               become_root();
-               sam_pass = getsam21pwrid(rid);
-               unbecome_root();
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-               if (sam_pass == NULL)
-               {
-                       status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
-               }
-       }
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       if (status == 0x0)
-       {
-               pstring groups;
-               get_domain_user_groups(groups, sam_pass->smb_name);
-                gids = NULL;
-               num_groups = make_dom_gids(groups, &gids);
+       if (!samr_io_q_del_groupmem("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_del_groupmem: unable to unmarshall SAMR_Q_DEL_GROUPMEM.\n"));
+               return False;
        }
 
-       /* construct the response.  lkclXXXX: gids are not copied! */
-       init_samr_r_query_usergroups(&r_u, num_groups, gids, status);
+       r_u.status = _samr_del_groupmem(p, &q_u, &r_u);
 
-       /* store the response in the SMB stream */
-       if(!samr_io_r_query_usergroups("", &r_u, rdata, 0)) {
-               if (gids)
-                       free((char *)gids);
+       if (!samr_io_r_del_groupmem("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_del_groupmem: unable to marshall SAMR_R_DEL_GROUPMEM.\n"));
                return False;
        }
 
-       if (gids)
-               free((char *)gids);
-
-       DEBUG(5,("samr_query_usergroups: %d\n", __LINE__));
-       
        return True;
 }
 
 /*******************************************************************
- api_samr_query_usergroups
+ api_samr_delete_dom_user
  ********************************************************************/
-static BOOL api_samr_query_usergroups(pipes_struct *p)
+
+static bool api_samr_delete_dom_user(pipes_struct *p)
 {
-       SAMR_Q_QUERY_USERGROUPS q_u;
+       SAMR_Q_DELETE_DOM_USER q_u;
+       SAMR_R_DELETE_DOM_USER r_u;
+
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       /* grab the samr unknown 32 */
-       if(!samr_io_q_query_usergroups("", &q_u, data, 0))
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       if (!samr_io_q_delete_dom_user("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_delete_dom_user: unable to unmarshall SAMR_Q_DELETE_DOM_USER.\n"));
                return False;
+       }
 
-       /* construct reply. */
-       if(!samr_reply_query_usergroups(&q_u, rdata))
+       r_u.status = _samr_delete_dom_user(p, &q_u, &r_u);
+
+       if (!samr_io_r_delete_dom_user("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_delete_dom_user: unable to marshall SAMR_R_DELETE_DOM_USER.\n"));
                return False;
+       }
 
        return True;
 }
 
-
 /*******************************************************************
- samr_reply_query_dom_info
+ api_samr_delete_dom_group
  ********************************************************************/
-static BOOL samr_reply_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u, prs_struct *rdata)
+
+static bool api_samr_delete_dom_group(pipes_struct *p)
 {
-       SAMR_R_QUERY_DOMAIN_INFO r_u;
-       SAM_UNK_CTR ctr;
-       uint16 switch_value = 0x0;
-       uint32 status = 0x0;
+       SAMR_Q_DELETE_DOM_GROUP q_u;
+       SAMR_R_DELETE_DOM_GROUP r_u;
+
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
+       ZERO_STRUCT(q_u);
        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;
-                       }
-               }
+
+       if (!samr_io_q_delete_dom_group("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_delete_dom_group: unable to unmarshall SAMR_Q_DELETE_DOM_GROUP.\n"));
+               return False;
        }
 
-       init_samr_r_query_dom_info(&r_u, switch_value, &ctr, status);
+       r_u.status = _samr_delete_dom_group(p, &q_u, &r_u);
 
-       /* store the response in the SMB stream */
-       if(!samr_io_r_query_dom_info("", &r_u, rdata, 0))
+       if (!samr_io_r_delete_dom_group("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_delete_dom_group: unable to marshall SAMR_R_DELETE_DOM_GROUP.\n"));
                return False;
-
-       DEBUG(5,("samr_query_dom_info: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_query_dom_info
+ api_samr_delete_dom_alias
  ********************************************************************/
-static BOOL api_samr_query_dom_info(pipes_struct *p)
+
+static bool api_samr_delete_dom_alias(pipes_struct *p)
 {
-       SAMR_Q_QUERY_DOMAIN_INFO q_e;
+       SAMR_Q_DELETE_DOM_ALIAS q_u;
+       SAMR_R_DELETE_DOM_ALIAS r_u;
+
        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))
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       if (!samr_io_q_delete_dom_alias("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_delete_dom_alias: unable to unmarshall SAMR_Q_DELETE_DOM_ALIAS.\n"));
                return False;
+       }
+
+       r_u.status = _samr_delete_dom_alias(p, &q_u, &r_u);
 
-       /* construct reply. */
-       if(!samr_reply_query_dom_info(&q_e, rdata))
+       if (!samr_io_r_delete_dom_alias("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_delete_dom_alias: unable to marshall SAMR_R_DELETE_DOM_ALIAS.\n"));
                return False;
+       }
 
        return True;
 }
 
-
 /*******************************************************************
- api_samr_create_user
+ api_samr_create_dom_group
  ********************************************************************/
-static BOOL api_samr_create_user(pipes_struct *p)
+
+static bool api_samr_create_dom_group(pipes_struct *p)
 {
-       struct sam_passwd *sam_pass;
-       fstring mach_acct;
-       pstring err_str;
-       pstring msg_str;
-       int local_flags=0;
-       
+       SAMR_Q_CREATE_DOM_GROUP q_u;
+       SAMR_R_CREATE_DOM_GROUP r_u;
+
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       SAMR_Q_CREATE_USER q_u;
-       SAMR_R_CREATE_USER r_u;
-
        ZERO_STRUCT(q_u);
        ZERO_STRUCT(r_u);
 
-       DEBUG(5,("api_samr_create_user: %d\n", __LINE__));
-
-       /* grab the samr create user */
-       if (!samr_io_q_create_user("", &q_u, data, 0)) {
-               DEBUG(0,("api_samr_create_user: Unable to unmarshall SAMR_Q_CREATE_USER.\n"));
+       if (!samr_io_q_create_dom_group("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_create_dom_group: unable to unmarshall SAMR_Q_CREATE_DOM_GROUP.\n"));
                return False;
        }
 
-       /* find the policy handle.  open a policy on it. */
-       if ((find_lsa_policy_by_hnd(&q_u.pol) == -1)) {
-               r_u.status = NT_STATUS_INVALID_HANDLE;
-               goto out;
-       }
-
-       /* 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, dos_unistrn2(q_u.uni_mach_acct.buffer, q_u.uni_mach_acct.uni_str_len));
-       strlower(mach_acct);
+       r_u.status = _samr_create_dom_group(p, &q_u, &r_u);
 
-       become_root();
-       sam_pass = getsam21pwnam(mach_acct);
-       unbecome_root();
-       if (sam_pass != NULL) {
-               /* machine account exists: say so */
-               r_u.status = NT_STATUS_USER_EXISTS;
-               goto out;
+       if (!samr_io_r_create_dom_group("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_create_dom_group: unable to marshall SAMR_R_CREATE_DOM_GROUP.\n"));
+               return False;
        }
 
-       /* get a (unique) handle.  open a policy on it. */
-       if (!open_lsa_policy_hnd(&r_u.pol)) {
-               r_u.status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
-               goto out;
-       }
+       return True;
+}
 
-       local_flags=LOCAL_ADD_USER|LOCAL_DISABLE_USER|LOCAL_SET_NO_PASSWORD;
-       local_flags|= (q_u.acb_info & ACB_WSTRUST) ? LOCAL_TRUST_ACCOUNT:0;
+/*******************************************************************
+ api_samr_create_dom_alias
+ ********************************************************************/
 
-       /*
-        * 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.
-        */
+static bool api_samr_create_dom_alias(pipes_struct *p)
+{
+       SAMR_Q_CREATE_DOM_ALIAS q_u;
+       SAMR_R_CREATE_DOM_ALIAS r_u;
 
-       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));
-               r_u.status = NT_STATUS_ACCESS_DENIED;
-               close_lsa_policy_hnd(&r_u.pol);
-               memset((char *)r_u.pol.data, '\0', POL_HND_SIZE);
-               goto out;
-       }
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       become_root();
-       sam_pass = getsam21pwnam(mach_acct);
-       unbecome_root();
-       if (sam_pass == NULL) {
-               /* account doesn't exist: say so */
-               r_u.status = NT_STATUS_ACCESS_DENIED;
-               close_lsa_policy_hnd(&r_u.pol);
-               memset((char *)r_u.pol.data, '\0', POL_HND_SIZE);
-               goto out;
-       }
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* associate the RID with the (unique) handle. */
-       if (!set_lsa_policy_samr_rid(&r_u.pol, sam_pass->user_rid)) {
-               /* oh, whoops.  don't know what error message to return, here */
-               r_u.status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
-               close_lsa_policy_hnd(&r_u.pol);
-               memset((char *)r_u.pol.data, '\0', POL_HND_SIZE);
-               goto out;
+       if (!samr_io_q_create_dom_alias("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_create_dom_alias: unable to unmarshall SAMR_Q_CREATE_DOM_ALIAS.\n"));
+               return False;
        }
 
-       r_u.unknown_0=0x000703ff;
-       r_u.user_rid=sam_pass->user_rid;
+       r_u.status = _samr_create_dom_alias(p, &q_u, &r_u);
 
- out:  
-       /* store the response in the SMB stream */
-       if(!samr_io_r_create_user("", &r_u, rdata, 0))
+       if (!samr_io_r_create_dom_alias("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_create_dom_alias: unable to marshall SAMR_R_CREATE_DOM_ALIAS.\n"));
                return False;
-
-       DEBUG(5,("api_samr_create_user: %d\n", __LINE__));
+       }
 
        return True;
 }
 
-
 /*******************************************************************
- samr_reply_connect_anon
+ api_samr_query_groupinfo
  ********************************************************************/
-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 */
+static bool api_samr_query_groupinfo(pipes_struct *p)
+{
+       SAMR_Q_QUERY_GROUPINFO q_u;
+       SAMR_R_QUERY_GROUPINFO r_u;
 
-       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;
-       }
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       /* 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;
-       }
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       if (r_u.status != 0 && pol_open)
-       {
-               close_lsa_policy_hnd(&(r_u.connect_pol));
+       if (!samr_io_q_query_groupinfo("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_query_groupinfo: unable to unmarshall SAMR_Q_QUERY_GROUPINFO.\n"));
+               return False;
        }
 
-       DEBUG(5,("samr_connect_anon: %d\n", __LINE__));
+       r_u.status = _samr_query_groupinfo(p, &q_u, &r_u);
 
-       /* store the response in the SMB stream */
-       if(!samr_io_r_connect_anon("", &r_u, rdata, 0))
+       if (!samr_io_r_query_groupinfo("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_groupinfo: unable to marshall SAMR_R_QUERY_GROUPINFO.\n"));
                return False;
-
-       DEBUG(5,("samr_connect_anon: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_connect_anon
+ api_samr_set_groupinfo
  ********************************************************************/
-static BOOL api_samr_connect_anon(pipes_struct *p)
+
+static bool api_samr_set_groupinfo(pipes_struct *p)
 {
-       SAMR_Q_CONNECT_ANON q_u;
+       SAMR_Q_SET_GROUPINFO q_u;
+       SAMR_R_SET_GROUPINFO r_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))
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       if (!samr_io_q_set_groupinfo("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_set_groupinfo: unable to unmarshall SAMR_Q_SET_GROUPINFO.\n"));
                return False;
+       }
 
-       /* construct reply.  always indicate success */
-       if(!samr_reply_connect_anon(&q_u, rdata))
+       r_u.status = _samr_set_groupinfo(p, &q_u, &r_u);
+
+       if (!samr_io_r_set_groupinfo("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_set_groupinfo: unable to marshall SAMR_R_SET_GROUPINFO.\n"));
                return False;
+       }
 
        return True;
 }
 
 /*******************************************************************
- samr_reply_connect
+ api_samr_set_aliasinfo
  ********************************************************************/
-static BOOL samr_reply_connect(SAMR_Q_CONNECT *q_u, prs_struct *rdata)
-{
-       SAMR_R_CONNECT r_u;
-       BOOL pol_open = False;
 
-       /* set up the SAMR connect response */
+static bool api_samr_set_aliasinfo(pipes_struct *p)
+{
+       SAMR_Q_SET_ALIASINFO q_u;
+       SAMR_R_SET_ALIASINFO r_u;
 
-       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;
-       }
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       /* 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;
-       }
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       if (r_u.status != 0 && pol_open)
-       {
-               close_lsa_policy_hnd(&(r_u.connect_pol));
+       if (!samr_io_q_set_aliasinfo("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_set_aliasinfo: unable to unmarshall SAMR_Q_SET_ALIASINFO.\n"));
+               return False;
        }
 
-       DEBUG(5,("samr_connect: %d\n", __LINE__));
+       r_u.status = _samr_set_aliasinfo(p, &q_u, &r_u);
 
-       /* store the response in the SMB stream */
-       if(!samr_io_r_connect("", &r_u, rdata, 0))
+       if (!samr_io_r_set_aliasinfo("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_set_aliasinfo: unable to marshall SAMR_R_SET_ALIASINFO.\n"));
                return False;
-
-       DEBUG(5,("samr_connect: %d\n", __LINE__));
+       }
 
        return True;
 }
 
 /*******************************************************************
- api_samr_connect
+ api_samr_get_dom_pwinfo
  ********************************************************************/
-static BOOL api_samr_connect(pipes_struct *p)
+
+static bool api_samr_get_dom_pwinfo(pipes_struct *p)
 {
-       SAMR_Q_CONNECT q_u;
+       SAMR_Q_GET_DOM_PWINFO q_u;
+       SAMR_R_GET_DOM_PWINFO r_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("", &q_u, data, 0))
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       if (!samr_io_q_get_dom_pwinfo("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_get_dom_pwinfo: unable to unmarshall SAMR_Q_GET_DOM_PWINFO.\n"));
                return False;
+       }
 
-       /* construct reply.  always indicate success */
-       if(!samr_reply_connect(&q_u, rdata))
+       r_u.status = _samr_get_dom_pwinfo(p, &q_u, &r_u);
+
+       if (!samr_io_r_get_dom_pwinfo("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_get_dom_pwinfo: unable to marshall SAMR_R_GET_DOM_PWINFO.\n"));
                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;
+/*******************************************************************
+ api_samr_open_group
+ ********************************************************************/
 
-  DEBUG(5,("samr_reply_lookup_domain: %d\n", __LINE__));
-       return True; 
-}
-  
-/**********************************************************************
- api_samr_lookup_domain
- **********************************************************************/
-static BOOL api_samr_lookup_domain(pipes_struct *p)
+static bool api_samr_open_group(pipes_struct *p)
 {
-       SAMR_Q_LOOKUP_DOMAIN q_u;
+       SAMR_Q_OPEN_GROUP q_u;
+       SAMR_R_OPEN_GROUP r_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];
-  
-  ZERO_STRUCT(r_u);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-  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);
+       if (!samr_io_q_open_group("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_open_group: unable to unmarshall SAMR_Q_OPEN_GROUP.\n"));
                return False;
        }
 
-  free(r_u.sam);
-  free(r_u.uni_dom_name);
+       r_u.status = _samr_open_group(p, &q_u, &r_u);
+
+       if (!samr_io_r_open_group("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_open_group: unable to marshall SAMR_R_OPEN_GROUP.\n"));
+               return False;
+       }
 
        return True;
 }
 
-/**********************************************************************
- api_samr_enum_domains
- **********************************************************************/
-static BOOL api_samr_enum_domains(pipes_struct *p)
+/*******************************************************************
+ api_samr_remove_sid_foreign_domain
+ ********************************************************************/
+
+static bool api_samr_remove_sid_foreign_domain(pipes_struct *p)
 {
-       SAMR_Q_ENUM_DOMAINS q_u;
+       SAMR_Q_REMOVE_SID_FOREIGN_DOMAIN q_u;
+       SAMR_R_REMOVE_SID_FOREIGN_DOMAIN r_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))
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       if (!samr_io_q_remove_sid_foreign_domain("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_remove_sid_foreign_domain: unable to unmarshall SAMR_Q_REMOVE_SID_FOREIGN_DOMAIN.\n"));
                return False;
-       
-       if(!samr_reply_enum_domains(&q_u, rdata))
+       }
+
+       r_u.status = _samr_remove_sid_foreign_domain(p, &q_u, &r_u);
+
+       if (!samr_io_r_remove_sid_foreign_domain("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_remove_sid_foreign_domain: unable to marshall SAMR_R_REMOVE_SID_FOREIGN_DOMAIN.\n"));
                return False;
-       
+       }
+
        return True;
 }
 
 /*******************************************************************
- samr_reply_open_alias
+ api_samr_query_dom_info2
  ********************************************************************/
-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;
-
-       /* set up the SAMR open_alias 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.pol))))
-       {
-               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
-       }
+static bool api_samr_query_domain_info2(pipes_struct *p)
+{
+       SAMR_Q_QUERY_DOMAIN_INFO2 q_u;
+       SAMR_R_QUERY_DOMAIN_INFO2 r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       /* associate a RID with the (unique) handle. */
-       if (r_u.status == 0x0 && !set_lsa_policy_samr_rid(&(r_u.pol), q_u->rid_alias))
-       {
-               /* oh, whoops.  don't know what error message to return, here */
-               r_u.status = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
-       }
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       if (r_u.status != 0 && pol_open)
-       {
-               close_lsa_policy_hnd(&(r_u.pol));
+       if(!samr_io_q_query_domain_info2("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_query_domain_info2: unable to unmarshall SAMR_Q_QUERY_DOMAIN_INFO2.\n"));
+               return False;
        }
 
-       DEBUG(5,("samr_open_alias: %d\n", __LINE__));
+       r_u.status = _samr_query_domain_info2(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!samr_io_r_open_alias("", &r_u, rdata, 0))
+       if(!samr_io_r_query_domain_info2("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_query_domain_info2: unable to marshall SAMR_R_QUERY_DOMAIN_INFO2.\n"));
                return False;
+       }
 
-       DEBUG(5,("samr_open_alias: %d\n", __LINE__));
-       
        return True;
 }
 
 /*******************************************************************
- api_samr_open_alias
+ api_samr_set_dom_info
  ********************************************************************/
-static BOOL api_samr_open_alias(pipes_struct *p)
+
+static bool api_samr_set_dom_info(pipes_struct *p)
 {
-       SAMR_Q_OPEN_ALIAS q_u;
+       SAMR_Q_SET_DOMAIN_INFO q_u;
+       SAMR_R_SET_DOMAIN_INFO r_u;
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       /* grab the samr open policy */
-       if(!samr_io_q_open_alias("", &q_u, data, 0))
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       if(!samr_io_q_set_domain_info("", &q_u, data, 0)) {
+               DEBUG(0,("api_samr_set_dom_info: unable to unmarshall SAMR_Q_SET_DOMAIN_INFO.\n"));
                return False;
+       }
 
-       /* construct reply.  always indicate success */
-       if(!samr_reply_open_alias(&q_u, rdata))
+       r_u.status = _samr_set_dom_info(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!samr_io_r_set_domain_info("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_samr_set_dom_info: unable to marshall SAMR_R_SET_DOMAIN_INFO.\n"));
                return False;
+       }
 
        return True;
 }
@@ -2209,40 +1497,75 @@ static BOOL api_samr_open_alias(pipes_struct *p)
 /*******************************************************************
  array of \PIPE\samr operations
  ********************************************************************/
+
 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 },
-       { "SAMR_LOOKUP_IDS"       , SAMR_LOOKUP_IDS       , api_samr_lookup_ids       },
-       { "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_CREATE_USER"      , SAMR_CREATE_USER      , api_samr_create_user      },
-       { "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        },
-       { "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                      }
+      {"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_DOMAINS"      , SAMR_ENUM_DOMAINS     , api_samr_enum_domains     },
+      {"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 },
+      {"SAMR_QUERY_USERALIASES" , SAMR_QUERY_USERALIASES, api_samr_query_useraliases},
+      {"SAMR_QUERY_ALIASMEM"    , SAMR_QUERY_ALIASMEM   , api_samr_query_aliasmem   },
+      {"SAMR_QUERY_GROUPMEM"    , SAMR_QUERY_GROUPMEM   , api_samr_query_groupmem   },
+      {"SAMR_ADD_ALIASMEM"      , SAMR_ADD_ALIASMEM     , api_samr_add_aliasmem     },
+      {"SAMR_DEL_ALIASMEM"      , SAMR_DEL_ALIASMEM     , api_samr_del_aliasmem     },
+      {"SAMR_ADD_GROUPMEM"      , SAMR_ADD_GROUPMEM     , api_samr_add_groupmem     },
+      {"SAMR_DEL_GROUPMEM"      , SAMR_DEL_GROUPMEM     , api_samr_del_groupmem     },
+      
+      {"SAMR_DELETE_DOM_USER"   , SAMR_DELETE_DOM_USER  , api_samr_delete_dom_user  },
+      {"SAMR_DELETE_DOM_GROUP"  , SAMR_DELETE_DOM_GROUP , api_samr_delete_dom_group },
+      {"SAMR_DELETE_DOM_ALIAS"  , SAMR_DELETE_DOM_ALIAS , api_samr_delete_dom_alias },
+      {"SAMR_CREATE_DOM_GROUP"  , SAMR_CREATE_DOM_GROUP , api_samr_create_dom_group },
+      {"SAMR_CREATE_DOM_ALIAS"  , SAMR_CREATE_DOM_ALIAS , api_samr_create_dom_alias },
+      {"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_SET_USERINFO"      , SAMR_SET_USERINFO     , api_samr_set_userinfo     },
+      {"SAMR_SET_USERINFO2"     , SAMR_SET_USERINFO2    , api_samr_set_userinfo2    },
+      
+      {"SAMR_QUERY_DOMAIN_INFO" , SAMR_QUERY_DOMAIN_INFO, api_samr_query_domain_info},
+      {"SAMR_QUERY_USERGROUPS"  , SAMR_QUERY_USERGROUPS , api_samr_query_usergroups },
+      {"SAMR_QUERY_DISPINFO"    , SAMR_QUERY_DISPINFO   , api_samr_query_dispinfo   },
+      {"SAMR_QUERY_DISPINFO3"   , SAMR_QUERY_DISPINFO3  , api_samr_query_dispinfo   },
+      {"SAMR_QUERY_DISPINFO4"   , SAMR_QUERY_DISPINFO4  , api_samr_query_dispinfo   },
+      
+      {"SAMR_QUERY_ALIASINFO"   , SAMR_QUERY_ALIASINFO  , api_samr_query_aliasinfo  },
+      {"SAMR_QUERY_GROUPINFO"   , SAMR_QUERY_GROUPINFO  , api_samr_query_groupinfo  },
+      {"SAMR_SET_GROUPINFO"     , SAMR_SET_GROUPINFO    , api_samr_set_groupinfo    },
+      {"SAMR_SET_ALIASINFO"     , SAMR_SET_ALIASINFO    , api_samr_set_aliasinfo    },
+      {"SAMR_CREATE_USER"       , SAMR_CREATE_USER      , api_samr_create_user      },
+      {"SAMR_LOOKUP_RIDS"       , SAMR_LOOKUP_RIDS      , api_samr_lookup_rids      },
+      {"SAMR_GET_DOM_PWINFO"    , SAMR_GET_DOM_PWINFO   , api_samr_get_dom_pwinfo   },
+      {"SAMR_CHGPASSWD_USER"    , SAMR_CHGPASSWD_USER   , api_samr_chgpasswd_user   },
+      {"SAMR_OPEN_ALIAS"        , SAMR_OPEN_ALIAS       , api_samr_open_alias       },
+      {"SAMR_OPEN_GROUP"        , SAMR_OPEN_GROUP       , api_samr_open_group       },
+      {"SAMR_OPEN_DOMAIN"       , SAMR_OPEN_DOMAIN      , api_samr_open_domain      },
+      {"SAMR_REMOVE_SID_FOREIGN_DOMAIN"       , SAMR_REMOVE_SID_FOREIGN_DOMAIN      , api_samr_remove_sid_foreign_domain      },
+      {"SAMR_LOOKUP_DOMAIN"     , SAMR_LOOKUP_DOMAIN    , api_samr_lookup_domain    },
+      
+      {"SAMR_QUERY_SEC_OBJECT"  , SAMR_QUERY_SEC_OBJECT , api_samr_query_sec_obj    },
+      {"SAMR_SET_SEC_OBJECT"    , SAMR_SET_SEC_OBJECT   , api_samr_set_sec_obj      },
+      {"SAMR_GET_USRDOM_PWINFO" , SAMR_GET_USRDOM_PWINFO, api_samr_get_usrdom_pwinfo},
+      {"SAMR_QUERY_DOMAIN_INFO2", SAMR_QUERY_DOMAIN_INFO2, api_samr_query_domain_info2},
+      {"SAMR_SET_DOMAIN_INFO"   , SAMR_SET_DOMAIN_INFO  , api_samr_set_dom_info     },
+      {"SAMR_CONNECT4"          , SAMR_CONNECT4         , api_samr_connect4         },
+      {"SAMR_CHGPASSWD_USER3"   , SAMR_CHGPASSWD_USER3  , api_samr_chgpasswd_user3  },
+      {"SAMR_CONNECT5"          , SAMR_CONNECT5         , api_samr_connect5         }
 };
 
-/*******************************************************************
- receives a samr pipe and responds.
- ********************************************************************/
-BOOL api_samr_rpc(pipes_struct *p)
+void samr_get_pipe_fns( struct api_struct **fns, int *n_fns )
+{
+       *fns = api_samr_cmds;
+       *n_fns = sizeof(api_samr_cmds) / sizeof(struct api_struct);
+}
+
+
+NTSTATUS rpc_samr_init(void)
 {
-       return api_rpcTNP(p, "api_samr_rpc", api_samr_cmds);
+  return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION, "samr", "lsass", api_samr_cmds,
+                                   sizeof(api_samr_cmds) / sizeof(struct api_struct));
 }
-#undef OLD_NTDOMAIN