This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to...
[sfrench/samba-autobuild/.git] / source3 / rpc_server / srv_lsa.c
index 9c3d7856276b96d9b7b308d2d4200cd7be1bd453..679cfb73bbad4fdda01d76aafacc93e40f523e88 100644 (file)
@@ -1,12 +1,12 @@
-#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) Jeremy Allison                    1998.
+ *  Copyright (C) Paul Ashton                       1997,
+ *  Copyright (C) Jeremy Allison                    2001,
+ *  Copyright (C) Jim McDonough                     2002,
+ *  Copyright (C) Anthony Liguori                   2003.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+/* This is the interface to the lsa server code. */
+
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-extern DOM_SID global_sam_sid;
-extern fstring global_myworkgroup;
-extern pstring global_myname;
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_SRV
 
 /***************************************************************************
lsa_reply_open_policy2
api_lsa_open_policy2
  ***************************************************************************/
 
-static BOOL lsa_reply_open_policy2(prs_struct *rdata)
+static BOOL api_lsa_open_policy2(pipes_struct *p)
 {
-       int i;
-       LSA_R_OPEN_POL2 r_o;
+       LSA_Q_OPEN_POL2 q_u;
+       LSA_R_OPEN_POL2 r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       ZERO_STRUCT(r_o);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* set up the LSA QUERY INFO response */
+       /* grab the server, object attributes and desired access flag...*/
+       if(!lsa_io_q_open_pol2("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_open_policy2: unable to unmarshall LSA_Q_OPEN_POL2.\n"));
+               return False;
+       }
 
-       for (i = 4; i < POL_HND_SIZE; i++)
-               r_o.pol.data[i] = i;
-       r_o.status = 0x0;
+       r_u.status = _lsa_open_policy2(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!lsa_io_r_open_pol2("", &r_o, rdata, 0)) {
-               DEBUG(0,("lsa_reply_open_policy2: unable to marshall LSA_R_OPEN_POL2.\n"));
+       if(!lsa_io_r_open_pol2("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_open_policy2: unable to marshall LSA_R_OPEN_POL2.\n"));
                return False;
        }
 
@@ -57,25 +62,30 @@ static BOOL lsa_reply_open_policy2(prs_struct *rdata)
 }
 
 /***************************************************************************
-lsa_reply_open_policy
+api_lsa_open_policy
  ***************************************************************************/
 
-static BOOL lsa_reply_open_policy(prs_struct *rdata)
+static BOOL api_lsa_open_policy(pipes_struct *p)
 {
-       int i;
-       LSA_R_OPEN_POL r_o;
+       LSA_Q_OPEN_POL q_u;
+       LSA_R_OPEN_POL r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       ZERO_STRUCT(r_o);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* set up the LSA QUERY INFO response */
+       /* grab the server, object attributes and desired access flag...*/
+       if(!lsa_io_q_open_pol("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_open_policy: unable to unmarshall LSA_Q_OPEN_POL.\n"));
+               return False;
+       }
 
-       for (i = 4; i < POL_HND_SIZE; i++)
-               r_o.pol.data[i] = i;
-       r_o.status = 0x0;
+       r_u.status = _lsa_open_policy(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!lsa_io_r_open_pol("", &r_o, rdata, 0)) {
-               DEBUG(0,("lsa_reply_open_policy: unable to marshall LSA_R_OPEN_POL.\n"));
+       if(!lsa_io_r_open_pol("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_open_policy: unable to marshall LSA_R_OPEN_POL.\n"));
                return False;
        }
 
@@ -83,70 +93,88 @@ static BOOL lsa_reply_open_policy(prs_struct *rdata)
 }
 
 /***************************************************************************
-Init dom_query
+ api_lsa_enum_trust_dom
  ***************************************************************************/
 
-static void init_dom_query(DOM_QUERY *d_q, char *dom_name, DOM_SID *dom_sid)
+static BOOL api_lsa_enum_trust_dom(pipes_struct *p)
 {
-       int domlen = (dom_name != NULL) ? strlen(dom_name) : 0;
+       LSA_Q_ENUM_TRUST_DOM q_u;
+       LSA_R_ENUM_TRUST_DOM 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 enum trust domain context etc. */
+       if(!lsa_io_q_enum_trust_dom("", &q_u, data, 0))
+               return False;
 
-       d_q->uni_dom_max_len = domlen * 2;
-       d_q->uni_dom_str_len = domlen * 2;
+       /* get required trusted domains information */
+       r_u.status = _lsa_enum_trust_dom(p, &q_u, &r_u);
 
-       d_q->buffer_dom_name = (dom_name != 0)   ? 1 : 0;
-       d_q->buffer_dom_sid  = (dom_sid != NULL) ? 1 : 0;
+       /* prepare the response */
+       if(!lsa_io_r_enum_trust_dom("", &r_u, rdata, 0))
+               return False;
 
-       /* this string is supposed to be character short */
-       init_unistr2(&d_q->uni_domain_name, dom_name, domlen);
-       if (dom_sid != NULL)
-               init_dom_sid2(&d_q->dom_sid, dom_sid);
+       return True;
 }
 
 /***************************************************************************
- lsa_reply_enum_trust_dom
+ api_lsa_query_info
  ***************************************************************************/
 
-static void lsa_reply_enum_trust_dom(LSA_Q_ENUM_TRUST_DOM *q_e,
-                               prs_struct *rdata,
-                               uint32 enum_context, char *dom_name, DOM_SID *dom_sid)
+static BOOL api_lsa_query_info(pipes_struct *p)
 {
-       LSA_R_ENUM_TRUST_DOM r_e;
+       LSA_Q_QUERY_INFO q_u;
+       LSA_R_QUERY_INFO 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(r_e);
+       /* grab the info class and policy handle */
+       if(!lsa_io_q_query("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_query_info: failed to unmarshall LSA_Q_QUERY_INFO.\n"));
+               return False;
+       }
 
-       /* set up the LSA QUERY INFO response */
-       init_r_enum_trust_dom(&r_e, enum_context, dom_name, dom_sid,
-             dom_name != NULL ? 0x0 : 0x80000000 | NT_STATUS_UNABLE_TO_FREE_VM);
+       r_u.status = _lsa_query_info(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       lsa_io_r_enum_trust_dom("", &r_e, rdata, 0);
+       if(!lsa_io_r_query("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_query_info: failed to marshall LSA_R_QUERY_INFO.\n"));
+               return False;
+       }
+
+       return True;
 }
 
 /***************************************************************************
-lsa_reply_query_info
+ api_lsa_lookup_sids
  ***************************************************************************/
 
-static BOOL lsa_reply_query_info(LSA_Q_QUERY_INFO *q_q, prs_struct *rdata,
-                               char *dom_name, DOM_SID *dom_sid, uint32 status_code)
+static BOOL api_lsa_lookup_sids(pipes_struct *p)
 {
-       LSA_R_QUERY_INFO r_q;
-
-       ZERO_STRUCT(r_q);
-
-       /* set up the LSA QUERY INFO response */
+       LSA_Q_LOOKUP_SIDS q_u;
+       LSA_R_LOOKUP_SIDS r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       if(status_code == 0) {
-               r_q.undoc_buffer = 0x22000000; /* bizarre */
-               r_q.info_class = q_q->info_class;
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-               init_dom_query(&r_q.dom.id5, dom_name, dom_sid);
+       /* grab the info class and policy handle */
+       if(!lsa_io_q_lookup_sids("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_lookup_sids: failed to unmarshall LSA_Q_LOOKUP_SIDS.\n"));
+               return False;
        }
 
-       r_q.status = status_code;
+       r_u.status = _lsa_lookup_sids(p, &q_u, &r_u);
 
-       /* store the response in the SMB stream */
-       if(!lsa_io_r_query("", &r_q, rdata, 0)) {
-               DEBUG(0,("lsa_reply_query_info: failed to marshall LSA_R_QUERY_INFO.\n"));
+       if(!lsa_io_r_lookup_sids("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_lookup_sids: Failed to marshall LSA_R_LOOKUP_SIDS.\n"));
                return False;
        }
 
@@ -154,226 +182,180 @@ static BOOL lsa_reply_query_info(LSA_Q_QUERY_INFO *q_q, prs_struct *rdata,
 }
 
 /***************************************************************************
- init_dom_ref - adds a domain if it's not already in, returns the index.
-***************************************************************************/
+ api_lsa_lookup_names
+ ***************************************************************************/
 
-static int init_dom_ref(DOM_R_REF *ref, char *dom_name, DOM_SID *dom_sid)
+static BOOL api_lsa_lookup_names(pipes_struct *p)
 {
-       int num = 0;
-       int len;
+       LSA_Q_LOOKUP_NAMES q_u;
+       LSA_R_LOOKUP_NAMES r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       if (dom_name != NULL) {
-               for (num = 0; num < ref->num_ref_doms_1; num++) {
-                       fstring domname;
-                       fstrcpy(domname, dos_unistr2_to_str(&ref->ref_dom[num].uni_dom_name));
-                       if (strequal(domname, dom_name))
-                               return num;
-               }
-       } else {
-               num = ref->num_ref_doms_1;
-       }
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       if (num >= MAX_REF_DOMAINS) {
-               /* index not found, already at maximum domain limit */
-               return -1;
+       /* grab the info class and policy handle */
+       if(!lsa_io_q_lookup_names("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_lookup_names: failed to unmarshall LSA_Q_LOOKUP_NAMES.\n"));
+               return False;
        }
 
-       ref->num_ref_doms_1 = num+1;
-       ref->ptr_ref_dom  = 1;
-       ref->max_entries = MAX_REF_DOMAINS;
-       ref->num_ref_doms_2 = num+1;
+       r_u.status = _lsa_lookup_names(p, &q_u, &r_u);
 
-       len = (dom_name != NULL) ? strlen(dom_name) : 0;
-       if(dom_name != NULL && len == 0)
-               len = 1;
-
-       init_uni_hdr(&ref->hdr_ref_dom[num].hdr_dom_name, len);
-       ref->hdr_ref_dom[num].ptr_dom_sid = dom_sid != NULL ? 1 : 0;
-
-       init_unistr2(&ref->ref_dom[num].uni_dom_name, dom_name, len);
-       init_dom_sid2(&ref->ref_dom[num].ref_dom, dom_sid );
+       /* store the response in the SMB stream */
+       if(!lsa_io_r_lookup_names("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_lookup_names: Failed to marshall LSA_R_LOOKUP_NAMES.\n"));
+               return False;
+       }
 
-       return num;
+       return True;
 }
 
 /***************************************************************************
- init_lsa_rid2s
+ api_lsa_close.
  ***************************************************************************/
 
-static void init_lsa_rid2s(DOM_R_REF *ref, DOM_RID2 *rid2,
-                               int num_entries, UNISTR2 name[MAX_LOOKUP_SIDS],
-                               uint32 *mapped_count)
+static BOOL api_lsa_close(pipes_struct *p)
 {
-       int i;
-       int total = 0;
-       *mapped_count = 0;
-
-       SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS);
-
-       for (i = 0; i < num_entries; i++) {
-               BOOL status = False;
-               DOM_SID dom_sid;
-               DOM_SID sid;
-               uint32 rid = 0xffffffff;
-               int dom_idx = -1;
-               pstring full_name;
-               fstring dom_name;
-               fstring user;
-               enum SID_NAME_USE sid_name_use = SID_NAME_UNKNOWN;
-
-               pstrcpy(full_name, dos_unistr2_to_str(&name[i]));
-
-               /*
-                * Try and split the name into a DOMAIN and
-                * user component.
-                */
-
-               split_domain_name(full_name, dom_name, user);
-
-               /*
-                * We only do anything with this name if we
-                * can map the Domain into a SID we know.
-                */
-
-               if (map_domain_name_to_sid(&dom_sid, dom_name)) {
-                       dom_idx = init_dom_ref(ref, dom_name, &dom_sid);
-
-                       if (local_lookup_name(dom_name, user, &sid, &sid_name_use) && sid_split_rid(&sid, &rid)) 
-                               status = True;
-               }
-
-               if (status)
-                       (*mapped_count)++;
-               else {
-                       dom_idx = -1;
-                       rid = 0xffffffff;
-                       sid_name_use = SID_NAME_UNKNOWN;
-               }
-
-               init_dom_rid2(&rid2[total], rid, sid_name_use, dom_idx);
-               total++;
-       }
-}
+       LSA_Q_CLOSE q_u;
+       LSA_R_CLOSE r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-/***************************************************************************
- init_reply_lookup_names
- ***************************************************************************/
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-static void init_reply_lookup_names(LSA_R_LOOKUP_NAMES *r_l,
-                DOM_R_REF *ref, uint32 num_entries,
-                DOM_RID2 *rid2, uint32 mapped_count)
-{
-       r_l->ptr_dom_ref  = 1;
-       r_l->dom_ref      = ref;
+       if (!lsa_io_q_close("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_close: lsa_io_q_close failed.\n"));
+               return False;
+       }
 
-       r_l->num_entries  = num_entries;
-       r_l->ptr_entries  = 1;
-       r_l->num_entries2 = num_entries;
-       r_l->dom_rid      = rid2;
+       r_u.status = _lsa_close(p, &q_u, &r_u);
 
-       r_l->mapped_count = mapped_count;
+       /* store the response in the SMB stream */
+       if (!lsa_io_r_close("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_close: lsa_io_r_close failed.\n"));
+               return False;
+       }
 
-       if (mapped_count == 0)
-               r_l->status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
-       else
-               r_l->status = 0x0;
+       return True;
 }
 
 /***************************************************************************
Init lsa_trans_names.
api_lsa_open_secret.
  ***************************************************************************/
 
-static void init_lsa_trans_names(DOM_R_REF *ref, LSA_TRANS_NAME_ENUM *trn,
-                               int num_entries, DOM_SID2 sid[MAX_LOOKUP_SIDS], uint32 *mapped_count)
+static BOOL api_lsa_open_secret(pipes_struct *p)
 {
-       int i;
-       int total = 0;
-       *mapped_count = 0;
-
-       SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS);
+       LSA_Q_OPEN_SECRET q_u;
+       LSA_R_OPEN_SECRET r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       for (i = 0; i < num_entries; i++) {
-               BOOL status = False;
-               DOM_SID find_sid = sid[i].sid;
-               uint32 rid = 0xffffffff;
-               int dom_idx = -1;
-               fstring name, dom_name;
-               enum SID_NAME_USE sid_name_use = (enum SID_NAME_USE)0;
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-               /* Lookup sid from winbindd */
+       if(!lsa_io_q_open_secret("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_open_secret: failed to unmarshall LSA_Q_OPEN_SECRET.\n"));
+               return False;
+       }
 
-               memset(dom_name, '\0', sizeof(dom_name));
-               memset(name, '\0', sizeof(name));
+       r_u.status = _lsa_open_secret(p, &q_u, &r_u);
 
-               status = lookup_sid(&find_sid, dom_name, name, &sid_name_use);
+       /* store the response in the SMB stream */
+       if(!lsa_io_r_open_secret("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_open_secret: Failed to marshall LSA_R_OPEN_SECRET.\n"));
+               return False;
+       }
 
-               if (!status) {
-                       sid_name_use = SID_NAME_UNKNOWN;
-               }
+       return True;
+}
 
-               /* Store domain sid in ref array */
+/***************************************************************************
+ api_lsa_open_secret.
+ ***************************************************************************/
 
-               if (find_sid.num_auths == 5) {
-                       sid_split_rid(&find_sid, &rid);
-               }
+static BOOL api_lsa_enum_privs(pipes_struct *p)
+{
+       LSA_Q_ENUM_PRIVS q_u;
+       LSA_R_ENUM_PRIVS r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-               dom_idx = init_dom_ref(ref, dom_name, &find_sid);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-               DEBUG(10,("init_lsa_trans_names: added user '%s\\%s' to referenced list.\n", dom_name, name ));
+       if(!lsa_io_q_enum_privs("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_enum_privs: failed to unmarshall LSA_Q_ENUM_PRIVS.\n"));
+               return False;
+       }
 
-               (*mapped_count)++;
+       r_u.status = _lsa_enum_privs(p, &q_u, &r_u);
 
-               init_lsa_trans_name(&trn->name[total], &trn->uni_name[total],
-                                       sid_name_use, name, dom_idx);
-               total++;
+       /* store the response in the SMB stream */
+       if(!lsa_io_r_enum_privs("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_enum_privs: Failed to marshall LSA_R_ENUM_PRIVS.\n"));
+               return False;
        }
 
-       trn->num_entries = total;
-       trn->ptr_trans_names = 1;
-       trn->num_entries2 = total;
+       return True;
 }
 
 /***************************************************************************
Init_reply_lookup_sids.
api_lsa_open_secret.
  ***************************************************************************/
 
-static void init_reply_lookup_sids(LSA_R_LOOKUP_SIDS *r_l,
-                DOM_R_REF *ref, LSA_TRANS_NAME_ENUM *names,
-                uint32 mapped_count)
+static BOOL api_lsa_priv_get_dispname(pipes_struct *p)
 {
-       r_l->ptr_dom_ref  = 1;
-       r_l->dom_ref      = ref;
-       r_l->names        = names;
-       r_l->mapped_count = mapped_count;
-
-       if (mapped_count == 0)
-               r_l->status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
-       else
-               r_l->status = 0x0;
+       LSA_Q_PRIV_GET_DISPNAME q_u;
+       LSA_R_PRIV_GET_DISPNAME 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(!lsa_io_q_priv_get_dispname("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_priv_get_dispname: failed to unmarshall LSA_Q_PRIV_GET_DISPNAME.\n"));
+               return False;
+       }
+
+       r_u.status = _lsa_priv_get_dispname(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!lsa_io_r_priv_get_dispname("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_priv_get_dispname: Failed to marshall LSA_R_PRIV_GET_DISPNAME.\n"));
+               return False;
+       }
+
+       return True;
 }
 
 /***************************************************************************
-lsa_reply_lookup_sids
+ api_lsa_open_secret.
  ***************************************************************************/
 
-static BOOL lsa_reply_lookup_sids(prs_struct *rdata, DOM_SID2 *sid, int num_entries)
+static BOOL api_lsa_enum_accounts(pipes_struct *p)
 {
-       LSA_R_LOOKUP_SIDS r_l;
-       DOM_R_REF ref;
-       LSA_TRANS_NAME_ENUM names;
-       uint32 mapped_count = 0;
+       LSA_Q_ENUM_ACCOUNTS q_u;
+       LSA_R_ENUM_ACCOUNTS r_u;
+       prs_struct *data = &p->in_data.data;
+       prs_struct *rdata = &p->out_data.rdata;
 
-       ZERO_STRUCT(r_l);
-       ZERO_STRUCT(ref);
-       ZERO_STRUCT(names);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* set up the LSA Lookup SIDs response */
-       init_lsa_trans_names(&ref, &names, num_entries, sid, &mapped_count);
-       init_reply_lookup_sids(&r_l, &ref, &names, mapped_count);
+       if(!lsa_io_q_enum_accounts("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_enum_accounts: failed to unmarshall LSA_Q_ENUM_ACCOUNTS.\n"));
+               return False;
+       }
+
+       r_u.status = _lsa_enum_accounts(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!lsa_io_r_lookup_sids("", &r_l, rdata, 0)) {
-               DEBUG(0,("lsa_reply_lookup_sids: Failed to marshall LSA_R_LOOKUP_SIDS.\n"));
+       if(!lsa_io_r_enum_accounts("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_enum_accounts: Failed to marshall LSA_R_ENUM_ACCOUNTS.\n"));
                return False;
        }
 
@@ -381,28 +363,30 @@ static BOOL lsa_reply_lookup_sids(prs_struct *rdata, DOM_SID2 *sid, int num_entr
 }
 
 /***************************************************************************
-lsa_reply_lookup_names
+ api_lsa_UNK_GET_CONNUSER
  ***************************************************************************/
 
-static BOOL lsa_reply_lookup_names(prs_struct *rdata,
-                UNISTR2 names[MAX_LOOKUP_SIDS], int num_entries)
+static BOOL api_lsa_unk_get_connuser(pipes_struct *p)
 {
-       LSA_R_LOOKUP_NAMES r_l;
-       DOM_R_REF ref;
-       DOM_RID2 rids[MAX_LOOKUP_SIDS];
-       uint32 mapped_count = 0;
+       LSA_Q_UNK_GET_CONNUSER q_u;
+       LSA_R_UNK_GET_CONNUSER 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(r_l);
-       ZERO_STRUCT(ref);
-       ZERO_ARRAY(rids);
+       if(!lsa_io_q_unk_get_connuser("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_unk_get_connuser: failed to unmarshall LSA_Q_UNK_GET_CONNUSER.\n"));
+               return False;
+       }
 
-       /* set up the LSA Lookup RIDs response */
-       init_lsa_rid2s(&ref, rids, num_entries, names, &mapped_count);
-       init_reply_lookup_names(&r_l, &ref, num_entries, rids, mapped_count);
+       r_u.status = _lsa_unk_get_connuser(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if(!lsa_io_r_lookup_names("", &r_l, rdata, 0)) {
-               DEBUG(0,("lsa_reply_lookup_names: Failed to marshall LSA_R_LOOKUP_NAMES.\n"));
+       if(!lsa_io_r_unk_get_connuser("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_unk_get_connuser: Failed to marshall LSA_R_UNK_GET_CONNUSER.\n"));
                return False;
        }
 
@@ -410,200 +394,217 @@ static BOOL lsa_reply_lookup_names(prs_struct *rdata,
 }
 
 /***************************************************************************
- api_lsa_open_policy2
+ api_lsa_open_user
  ***************************************************************************/
 
-static BOOL api_lsa_open_policy2(pipes_struct *p)
+static BOOL api_lsa_open_account(pipes_struct *p)
 {
+       LSA_Q_OPENACCOUNT q_u;
+       LSA_R_OPENACCOUNT r_u;
+       
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       LSA_Q_OPEN_POL2 q_o;
-
-       ZERO_STRUCT(q_o);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* grab the server, object attributes and desired access flag...*/
-       if(!lsa_io_q_open_pol2("", &q_o, data, 0)) {
-               DEBUG(0,("api_lsa_open_policy2: unable to unmarshall LSA_Q_OPEN_POL2.\n"));
+       if(!lsa_io_q_open_account("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_open_account: failed to unmarshall LSA_Q_OPENACCOUNT.\n"));
                return False;
        }
 
-       /* lkclXXXX having decoded it, ignore all fields in the open policy! */
+       r_u.status = _lsa_open_account(p, &q_u, &r_u);
 
-       /* return a 20 byte policy handle */
-       if(!lsa_reply_open_policy2(rdata))
+       /* store the response in the SMB stream */
+       if(!lsa_io_r_open_account("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_open_account: Failed to marshall LSA_R_OPENACCOUNT.\n"));
                return False;
+       }
 
        return True;
 }
 
 /***************************************************************************
-api_lsa_open_policy
+ api_lsa_get_privs
  ***************************************************************************/
-static BOOL api_lsa_open_policy(pipes_struct *p)
+
+static BOOL api_lsa_enum_privsaccount(pipes_struct *p)
 {
+       LSA_Q_ENUMPRIVSACCOUNT q_u;
+       LSA_R_ENUMPRIVSACCOUNT r_u;
+       
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       LSA_Q_OPEN_POL q_o;
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       ZERO_STRUCT(q_o);
-
-       /* grab the server, object attributes and desired access flag...*/
-       if(!lsa_io_q_open_pol("", &q_o, data, 0)) {
-               DEBUG(0,("api_lsa_open_policy: unable to unmarshall LSA_Q_OPEN_POL.\n"));
+       if(!lsa_io_q_enum_privsaccount("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_enum_privsaccount: failed to unmarshall LSA_Q_ENUMPRIVSACCOUNT.\n"));
                return False;
        }
 
-       /* lkclXXXX having decoded it, ignore all fields in the open policy! */
+       r_u.status = _lsa_enum_privsaccount(p, &q_u, &r_u);
 
-       /* return a 20 byte policy handle */
-       if(!lsa_reply_open_policy(rdata))
+       /* store the response in the SMB stream */
+       if(!lsa_io_r_enum_privsaccount("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_enum_privsaccount: Failed to marshall LSA_R_ENUMPRIVSACCOUNT.\n"));
                return False;
+       }
 
        return True;
 }
 
 /***************************************************************************
-api_lsa_enum_trust_dom
+ api_lsa_getsystemaccount
  ***************************************************************************/
-static BOOL api_lsa_enum_trust_dom(pipes_struct *p)
+
+static BOOL api_lsa_getsystemaccount(pipes_struct *p)
 {
-       LSA_Q_ENUM_TRUST_DOM q_e;
+       LSA_Q_GETSYSTEMACCOUNT q_u;
+       LSA_R_GETSYSTEMACCOUNT r_u;
+       
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       ZERO_STRUCT(q_e);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* grab the enum trust domain context etc. */
-       if(!lsa_io_q_enum_trust_dom("", &q_e, data, 0))
+       if(!lsa_io_q_getsystemaccount("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_getsystemaccount: failed to unmarshall LSA_Q_GETSYSTEMACCOUNT.\n"));
                return False;
+       }
 
-       /* construct reply.  return status is always 0x0 */
-       lsa_reply_enum_trust_dom(&q_e, rdata, 0, NULL, NULL);
+       r_u.status = _lsa_getsystemaccount(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!lsa_io_r_getsystemaccount("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_getsystemaccount: Failed to marshall LSA_R_GETSYSTEMACCOUNT.\n"));
+               return False;
+       }
 
        return True;
 }
 
+
 /***************************************************************************
-api_lsa_query_info
+ api_lsa_setsystemaccount
  ***************************************************************************/
-static BOOL api_lsa_query_info(pipes_struct *p)
+
+static BOOL api_lsa_setsystemaccount(pipes_struct *p)
 {
-       LSA_Q_QUERY_INFO q_i;
-       DOM_SID domain_sid;
-       char *name = NULL;
-       DOM_SID *sid = NULL;
-       uint32 status_code = 0;
+       LSA_Q_SETSYSTEMACCOUNT q_u;
+       LSA_R_SETSYSTEMACCOUNT r_u;
+       
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       ZERO_STRUCT(q_i);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* grab the info class and policy handle */
-       if(!lsa_io_q_query("", &q_i, data, 0)) {
-               DEBUG(0,("api_lsa_query_info: failed to unmarshall LSA_Q_QUERY_INFO.\n"));
+       if(!lsa_io_q_setsystemaccount("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_setsystemaccount: failed to unmarshall LSA_Q_SETSYSTEMACCOUNT.\n"));
                return False;
        }
 
-       switch (q_i.info_class) {
-       case 0x03:
-               switch (lp_server_role())
-               {
-                       case ROLE_DOMAIN_PDC:
-                       case ROLE_DOMAIN_BDC:
-                               name = global_myworkgroup;
-                               sid = &global_sam_sid;
-                               break;
-                       case ROLE_DOMAIN_MEMBER:
-                               if (secrets_fetch_domain_sid(global_myworkgroup,
-                                       &domain_sid))
-                               {
-                                       name = global_myworkgroup;
-                                       sid = &domain_sid;
-                               }
-                       default:
-                               break;
-               }
-               break;
-       case 0x05:
-               name = global_myname;
-               sid = &global_sam_sid;
-               break;
-       default:
-               DEBUG(0,("api_lsa_query_info: unknown info level in Lsa Query: %d\n", q_i.info_class));
-               status_code = (NT_STATUS_INVALID_INFO_CLASS | 0xC0000000);
-               break;
-       }
-
-       /* construct reply.  return status is always 0x0 */
-       if(!lsa_reply_query_info(&q_i, rdata, name, sid, status_code))
+       r_u.status = _lsa_setsystemaccount(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!lsa_io_r_setsystemaccount("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_setsystemaccount: Failed to marshall LSA_R_SETSYSTEMACCOUNT.\n"));
                return False;
+       }
 
        return True;
 }
 
 /***************************************************************************
- api_lsa_lookup_sids
+ api_lsa_addprivs
  ***************************************************************************/
 
-static BOOL api_lsa_lookup_sids(pipes_struct *p)
+static BOOL api_lsa_addprivs(pipes_struct *p)
 {
-       LSA_Q_LOOKUP_SIDS q_l;
+       LSA_Q_ADDPRIVS q_u;
+       LSA_R_ADDPRIVS r_u;
+       
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       ZERO_STRUCT(q_l);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* grab the info class and policy handle */
-       if(!lsa_io_q_lookup_sids("", &q_l, data, 0)) {
-               DEBUG(0,("api_lsa_lookup_sids: failed to unmarshall LSA_Q_LOOKUP_SIDS.\n"));
+       if(!lsa_io_q_addprivs("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_addprivs: failed to unmarshall LSA_Q_ADDPRIVS.\n"));
                return False;
        }
 
-       /* construct reply.  return status is always 0x0 */
-       if(!lsa_reply_lookup_sids(rdata, q_l.sids.sid, q_l.sids.num_entries))
+       r_u.status = _lsa_addprivs(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!lsa_io_r_addprivs("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_addprivs: Failed to marshall LSA_R_ADDPRIVS.\n"));
                return False;
+       }
 
        return True;
 }
 
 /***************************************************************************
- api_lsa_lookup_names
+ api_lsa_removeprivs
  ***************************************************************************/
 
-static BOOL api_lsa_lookup_names(pipes_struct *p)
+static BOOL api_lsa_removeprivs(pipes_struct *p)
 {
-       LSA_Q_LOOKUP_NAMES q_l;
+       LSA_Q_REMOVEPRIVS q_u;
+       LSA_R_REMOVEPRIVS r_u;
+       
        prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       ZERO_STRUCT(q_l);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
 
-       /* grab the info class and policy handle */
-       if(!lsa_io_q_lookup_names("", &q_l, data, 0)) {
-               DEBUG(0,("api_lsa_lookup_names: failed to unmarshall LSA_Q_LOOKUP_NAMES.\n"));
+       if(!lsa_io_q_removeprivs("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_removeprivs: failed to unmarshall LSA_Q_REMOVEPRIVS.\n"));
                return False;
        }
 
-       SMB_ASSERT_ARRAY(q_l.uni_name, q_l.num_entries);
+       r_u.status = _lsa_removeprivs(p, &q_u, &r_u);
+
+       /* store the response in the SMB stream */
+       if(!lsa_io_r_removeprivs("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_removeprivs: Failed to marshall LSA_R_REMOVEPRIVS.\n"));
+               return False;
+       }
 
-       return lsa_reply_lookup_names(rdata, q_l.uni_name, q_l.num_entries);
+       return True;
 }
 
 /***************************************************************************
- api_lsa_close
+ api_lsa_query_secobj
  ***************************************************************************/
-static BOOL api_lsa_close(pipes_struct *p)
+
+static BOOL api_lsa_query_secobj(pipes_struct *p)
 {
-       LSA_R_CLOSE r_c;
+       LSA_Q_QUERY_SEC_OBJ q_u;
+       LSA_R_QUERY_SEC_OBJ r_u;
+       
+       prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       ZERO_STRUCT(r_c);
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       if(!lsa_io_q_query_sec_obj("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_query_secobj: failed to unmarshall LSA_Q_QUERY_SEC_OBJ.\n"));
+               return False;
+       }
+
+       r_u.status = _lsa_query_secobj(p, &q_u, &r_u);
 
        /* store the response in the SMB stream */
-       if (!lsa_io_r_close("", &r_c, rdata, 0)) {
-               DEBUG(0,("api_lsa_close: lsa_io_r_close failed.\n"));
+       if(!lsa_io_r_query_sec_obj("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_query_secobj: Failed to marshall LSA_R_QUERY_SEC_OBJ.\n"));
                return False;
        }
 
@@ -611,54 +612,77 @@ static BOOL api_lsa_close(pipes_struct *p)
 }
 
 /***************************************************************************
- api_lsa_open_secret
+ api_lsa_query_dnsdomainfo
  ***************************************************************************/
-static BOOL api_lsa_open_secret(pipes_struct *p)
+
+static BOOL api_lsa_query_info2(pipes_struct *p)
 {
-       /* XXXX this is NOT good */
-       size_t i;
-       uint32 dummy = 0;
+       LSA_Q_QUERY_INFO2 q_u;
+       LSA_R_QUERY_INFO2 r_u;
+
+       prs_struct *data = &p->in_data.data;
        prs_struct *rdata = &p->out_data.rdata;
 
-       for(i =0; i < 4; i++) {
-               if(!prs_uint32("api_lsa_close", rdata, 1, &dummy)) {
-                       DEBUG(0,("api_lsa_open_secret: prs_uint32 %d failed.\n",
-                               (int)i ));
-                       return False;
-               }
+       ZERO_STRUCT(q_u);
+       ZERO_STRUCT(r_u);
+
+       if(!lsa_io_q_query_info2("", &q_u, data, 0)) {
+               DEBUG(0,("api_lsa_query_info2: failed to unmarshall LSA_Q_QUERY_INFO2.\n"));
+               return False;
        }
 
-       dummy = 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND;
-       if(!prs_uint32("api_lsa_close", rdata, 1, &dummy)) {
-               DEBUG(0,("api_lsa_open_secret: prs_uint32 status failed.\n"));
+       r_u.status = _lsa_query_info2(p, &q_u, &r_u);
+
+       if (!lsa_io_r_query_info2("", &r_u, rdata, 0)) {
+               DEBUG(0,("api_lsa_query_info2: failed to marshall LSA_R_QUERY_INFO2.\n"));
                return False;
        }
 
        return True;
 }
 
+
 /***************************************************************************
  \PIPE\ntlsa commands
  ***************************************************************************/
-static struct api_struct api_lsa_cmds[] =
+NTSTATUS rpc_lsa_init(void)
+{
+static const struct api_struct api_lsa_cmds[] =
 {
-       { "LSA_OPENPOLICY2"     , LSA_OPENPOLICY2     , api_lsa_open_policy2   },
-       { "LSA_OPENPOLICY"      , LSA_OPENPOLICY      , api_lsa_open_policy    },
-       { "LSA_QUERYINFOPOLICY" , LSA_QUERYINFOPOLICY , api_lsa_query_info     },
-       { "LSA_ENUMTRUSTDOM"    , LSA_ENUMTRUSTDOM    , api_lsa_enum_trust_dom },
-       { "LSA_CLOSE"           , LSA_CLOSE           , api_lsa_close          },
-       { "LSA_OPENSECRET"      , LSA_OPENSECRET      , api_lsa_open_secret    },
-       { "LSA_LOOKUPSIDS"      , LSA_LOOKUPSIDS      , api_lsa_lookup_sids    },
-       { "LSA_LOOKUPNAMES"     , LSA_LOOKUPNAMES     , api_lsa_lookup_names   },
-       { NULL                  , 0                   , NULL                   }
+       { "LSA_OPENPOLICY2"     , LSA_OPENPOLICY2     , api_lsa_open_policy2     },
+       { "LSA_OPENPOLICY"      , LSA_OPENPOLICY      , api_lsa_open_policy      },
+       { "LSA_QUERYINFOPOLICY" , LSA_QUERYINFOPOLICY , api_lsa_query_info       },
+       { "LSA_ENUMTRUSTDOM"    , LSA_ENUMTRUSTDOM    , api_lsa_enum_trust_dom   },
+       { "LSA_CLOSE"           , LSA_CLOSE           , api_lsa_close            },
+       { "LSA_OPENSECRET"      , LSA_OPENSECRET      , api_lsa_open_secret      },
+       { "LSA_LOOKUPSIDS"      , LSA_LOOKUPSIDS      , api_lsa_lookup_sids      },
+       { "LSA_LOOKUPNAMES"     , LSA_LOOKUPNAMES     , api_lsa_lookup_names     },
+       { "LSA_ENUM_PRIVS"      , LSA_ENUM_PRIVS      , api_lsa_enum_privs       },
+       { "LSA_PRIV_GET_DISPNAME",LSA_PRIV_GET_DISPNAME,api_lsa_priv_get_dispname},
+       { "LSA_ENUM_ACCOUNTS"   , LSA_ENUM_ACCOUNTS   , api_lsa_enum_accounts    },
+       { "LSA_UNK_GET_CONNUSER", LSA_UNK_GET_CONNUSER, api_lsa_unk_get_connuser },
+       { "LSA_OPENACCOUNT"     , LSA_OPENACCOUNT     , api_lsa_open_account     },
+       { "LSA_ENUMPRIVSACCOUNT", LSA_ENUMPRIVSACCOUNT, api_lsa_enum_privsaccount},
+       { "LSA_GETSYSTEMACCOUNT", LSA_GETSYSTEMACCOUNT, api_lsa_getsystemaccount },
+       { "LSA_SETSYSTEMACCOUNT", LSA_SETSYSTEMACCOUNT, api_lsa_setsystemaccount },
+       { "LSA_ADDPRIVS"        , LSA_ADDPRIVS        , api_lsa_addprivs         },
+       { "LSA_REMOVEPRIVS"     , LSA_REMOVEPRIVS     , api_lsa_removeprivs      },
+       { "LSA_QUERYSECOBJ"     , LSA_QUERYSECOBJ     , api_lsa_query_secobj     },
+       /* be careful of the adding of new RPC's.  See commentrs below about
+          ADS DC capabilities                                               */
+       { "LSA_QUERYINFO2"      , LSA_QUERYINFO2      , api_lsa_query_info2      }
 };
+/*
+ * NOTE: Certain calls can not be enabled if we aren't an ADS DC.  Make sure
+ * these calls are always last and that you decrement by the amount of calls
+ * to disable.
+ */
+  int funcs = sizeof(api_lsa_cmds) / sizeof(struct api_struct);
 
-/***************************************************************************
- api_ntLsarpcTNP
- ***************************************************************************/
-BOOL api_ntlsa_rpc(pipes_struct *p)
-{
-       return api_rpcTNP(p, "api_ntlsa_rpc", api_lsa_cmds);
-}
+  if (!(SEC_ADS == lp_security() && ROLE_DOMAIN_PDC == lp_server_role())) {
+         funcs -= 1;
+  }
 
-#undef OLD_NTDOMAIN
+  return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION, "lsarpc", "lsass", api_lsa_cmds, 
+                                   funcs);
+}