r4414: Various bits&pieces:
[samba.git] / source4 / rpc_server / samr / dcesrv_samr.c
index 00513cd0e622f7d8876fc5d918708fec901cdf87..d16afa28023b00c89ecb3483596aab44e7d75cda 100644 (file)
@@ -4,6 +4,7 @@
    endpoint server for the samr pipe
 
    Copyright (C) Andrew Tridgell 2004
+   Copyright (C) Volker Lendecke 2004
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_samr.h"
+#include "rpc_server/dcerpc_server.h"
 #include "rpc_server/common/common.h"
 #include "rpc_server/samr/dcesrv_samr.h"
-
+#include "system/time.h"
+#include "lib/ldb/include/ldb.h"
 
 
 /*
@@ -34,6 +38,15 @@ static void samr_handle_destroy(struct dcesrv_connection *conn, struct dcesrv_ha
        talloc_free(h->data);
 }
 
+/*
+  This is a bad temporary hack until we have at least some kind of schema
+  support
+*/
+static char *ldb_hexstr(TALLOC_CTX *mem_ctx, uint32 val)
+{
+       return talloc_asprintf(mem_ctx, "0x%.8x", val);
+}
+
 /* 
   samr_Connect 
 
@@ -87,7 +100,7 @@ static NTSTATUS samr_Close(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_c
 
        DCESRV_PULL_HANDLE(h, r->in.handle, DCESRV_HANDLE_ANY);
 
-       /* this causes the callback samr_XXX_destroy() to be called by
+       /* this causes the parameters samr_XXX_destroy() to be called by
           the handle destroy code which destroys the state associated
           with the handle */
        dcesrv_handle_destroy(dce_call->conn, h);
@@ -115,13 +128,13 @@ static NTSTATUS samr_QuerySecurity(struct dcesrv_call_state *dce_call, TALLOC_CT
                                   struct samr_QuerySecurity *r)
 {
        struct dcesrv_handle *h;
-       struct samr_SdBuf *sd;
+       struct sec_desc_buf *sd;
 
        r->out.sdbuf = NULL;
 
        DCESRV_PULL_HANDLE(h, r->in.handle, DCESRV_HANDLE_ANY);
 
-       sd = talloc_p(mem_ctx, struct samr_SdBuf);
+       sd = talloc_p(mem_ctx, struct sec_desc_buf);
        if (sd == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -166,14 +179,14 @@ static NTSTATUS samr_LookupDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX
 
        c_state = h->data;
 
-       if (r->in.domain->name == NULL) {
+       if (r->in.domain->string == NULL) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
        sidstr = samdb_search_string(c_state->sam_ctx,
                                     mem_ctx, NULL, "objectSid",
                                     "(&(name=%s)(objectclass=domain))",
-                                    r->in.domain->name);
+                                    r->in.domain->string);
        if (sidstr == NULL) {
                return NT_STATUS_NO_SUCH_DOMAIN;
        }
@@ -181,7 +194,7 @@ static NTSTATUS samr_LookupDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX
        sid = dom_sid_parse_talloc(mem_ctx, sidstr);
        if (sid == NULL) {
                DEBUG(0,("samdb: Invalid sid '%s' for domain %s\n",
-                        sidstr, r->in.domain->name));
+                        sidstr, r->in.domain->string));
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
@@ -245,7 +258,7 @@ static NTSTATUS samr_EnumDomains(struct dcesrv_call_state *dce_call, TALLOC_CTX
 
        for (i=0;i<count-start_i;i++) {
                array->entries[i].idx = start_i + i;
-               array->entries[i].name.name = domains[start_i+i];
+               array->entries[i].name.string = domains[start_i+i];
        }
 
        r->out.sam = array;
@@ -327,6 +340,39 @@ static NTSTATUS samr_OpenDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX *
        return NT_STATUS_OK;
 }
 
+/*
+  return DomInfo1
+*/
+static NTSTATUS samr_info_DomInfo1(struct samr_domain_state *state,
+                                  TALLOC_CTX *mem_ctx,
+                                  struct samr_DomInfo1 *info)
+{
+       const char * const attrs[] = { "minPwdLength", "pwdHistoryLength",
+                                      "pwdProperties", "maxPwdAge",
+                                      "minPwdAge", NULL };
+       int ret;
+       struct ldb_message **res;
+
+       ret = samdb_search(state->sam_ctx, mem_ctx, NULL, &res, attrs, 
+                          "dn=%s", state->domain_dn);
+       if (ret != 1) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       info->min_password_length =
+               samdb_result_uint(res[0], "minPwdLength", 0);
+       info->password_history_length =
+               samdb_result_uint(res[0], "pwdHistoryLength", 0);
+       info->password_properties = 
+               samdb_result_uint(res[0], "pwdProperties", 0);
+       info->max_password_age = 
+               samdb_result_int64(res[0], "maxPwdAge", 0);
+       info->min_password_age = 
+               samdb_result_int64(res[0], "minPwdAge", 0);
+
+       return NT_STATUS_OK;
+}
+
 /*
   return DomInfo2
 */
@@ -346,10 +392,10 @@ static NTSTATUS samr_info_DomInfo2(struct samr_domain_state *state, TALLOC_CTX *
        /* where is this supposed to come from? is it settable? */
        info->force_logoff_time = 0x8000000000000000LL;
 
-       info->comment.name = samdb_result_string(res[0], "comment", NULL);
-       info->domain.name  = samdb_result_string(res[0], "name", NULL);
+       info->comment.string = samdb_result_string(res[0], "comment", NULL);
+       info->domain.string  = samdb_result_string(res[0], "name", NULL);
 
-       info->primary.name = lp_netbios_name();
+       info->primary.string = lp_netbios_name();
        info->sequence_num = 0;
        info->role = ROLE_DOMAIN_PDC;
        info->num_users = samdb_search_count(state->sam_ctx, mem_ctx, NULL, "(objectClass=user)");
@@ -386,6 +432,9 @@ static NTSTATUS samr_QueryDomainInfo(struct dcesrv_call_state *dce_call, TALLOC_
        ZERO_STRUCTP(r->out.info);
 
        switch (r->in.level) {
+       case 1:
+               return samr_info_DomInfo1(d_state, mem_ctx,
+                                         &r->out.info->info1);
        case 2:
                return samr_info_DomInfo2(d_state, mem_ctx, &r->out.info->info2);
        }
@@ -415,7 +464,8 @@ static NTSTATUS samr_CreateDomainGroup(struct dcesrv_call_state *dce_call, TALLO
        const char *name;
        struct ldb_message msg;
        uint32_t rid;
-       const char *groupname, *sidstr;
+       const char *groupname, *sidstr, *guidstr;
+       struct GUID guid;
        time_t now = time(NULL);
        struct dcesrv_handle *g_handle;
        int ret;
@@ -428,7 +478,7 @@ static NTSTATUS samr_CreateDomainGroup(struct dcesrv_call_state *dce_call, TALLO
 
        d_state = h->data;
 
-       groupname = r->in.name->name;
+       groupname = r->in.name->string;
 
        if (groupname == NULL) {
                return NT_STATUS_INVALID_PARAMETER;
@@ -466,26 +516,27 @@ static NTSTATUS samr_CreateDomainGroup(struct dcesrv_call_state *dce_call, TALLO
                return NT_STATUS_NO_MEMORY;
        }
 
+       /* a new GUID */
+       guid = GUID_random();
+       guidstr = GUID_string(mem_ctx, &guid);
+       if (!guidstr) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
        /* add core elements to the ldb_message for the user */
        msg.dn = talloc_asprintf(mem_ctx, "CN=%s,CN=Users,%s", groupname,
                                 d_state->domain_dn);
        if (!msg.dn) {
                return NT_STATUS_NO_MEMORY;
        }
-       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
-                            "name", groupname);
-       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
-                            "cn", groupname);
-       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
-                            "sAMAccountName", groupname);
-       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
-                            "objectClass", "group");
-       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
-                            "objectSid", sidstr);
-       samdb_msg_set_ldaptime(d_state->sam_ctx, mem_ctx, &msg,
-                              "whenCreated", now);
-       samdb_msg_set_ldaptime(d_state->sam_ctx, mem_ctx, &msg,
-                              "whenChanged", now);
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "name", groupname);
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "cn", groupname);
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "sAMAccountName", groupname);
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectClass", "group");
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectSid", sidstr);
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectGUID", guidstr);
+       samdb_msg_set_ldaptime(d_state->sam_ctx, mem_ctx, &msg, "whenCreated", now);
+       samdb_msg_set_ldaptime(d_state->sam_ctx, mem_ctx, &msg, "whenChanged", now);
                             
        /* create the group */
        ret = samdb_add(d_state->sam_ctx, mem_ctx, &msg);
@@ -501,11 +552,10 @@ static NTSTATUS samr_CreateDomainGroup(struct dcesrv_call_state *dce_call, TALLO
        a_state->sam_ctx = d_state->sam_ctx;
        a_state->access_mask = r->in.access_mask;
        a_state->domain_state = talloc_reference(a_state, d_state);
-       a_state->account_dn = talloc_steal(d_state, msg.dn);
-       a_state->account_sid = talloc_strdup(d_state, sidstr);
-       a_state->account_name = talloc_strdup(d_state, groupname);
-       if (!a_state->account_name || !a_state->account_sid) {
-               talloc_free(a_state);
+       a_state->account_dn = talloc_steal(a_state, msg.dn);
+       a_state->account_sid = talloc_steal(a_state, sidstr);
+       a_state->account_name = talloc_strdup(a_state, groupname);
+       if (!a_state->account_name) {
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -525,13 +575,111 @@ static NTSTATUS samr_CreateDomainGroup(struct dcesrv_call_state *dce_call, TALLO
 }
 
 
+/*
+  comparison function for sorting SamEntry array
+*/
+static int compare_SamEntry(struct samr_SamEntry *e1, struct samr_SamEntry *e2)
+{
+       return e1->idx - e2->idx;
+}
+
 /* 
   samr_EnumDomainGroups 
 */
 static NTSTATUS samr_EnumDomainGroups(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                      struct samr_EnumDomainGroups *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct dcesrv_handle *h;
+       struct samr_domain_state *d_state;
+       struct ldb_message **res;
+       int ldb_cnt, count, i, first;
+       struct samr_SamEntry *entries;
+       const char * const attrs[3] = { "objectSid", "sAMAccountName", NULL };
+       struct dom_sid *domain_sid;
+
+       *r->out.resume_handle = 0;
+       r->out.sam = NULL;
+       r->out.num_entries = 0;
+
+       DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
+
+       d_state = h->data;
+
+       domain_sid = dom_sid_parse_talloc(mem_ctx, d_state->domain_sid);
+       if (domain_sid == NULL)
+               return NT_STATUS_NO_MEMORY;
+       
+       /* search for all domain groups in this domain. This could possibly be
+          cached and resumed based on resume_key */
+       ldb_cnt = samdb_search_domain(d_state->sam_ctx, mem_ctx,
+                                     d_state->domain_dn, &res, attrs,
+                                     domain_sid,
+                                     "(&(grouptype=%s)(objectclass=group))",
+                                     ldb_hexstr(mem_ctx,
+                                                GTYPE_SECURITY_GLOBAL_GROUP));
+       if (ldb_cnt == -1) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+       if (ldb_cnt == 0 || r->in.max_size == 0) {
+               return NT_STATUS_OK;
+       }
+
+       /* convert to SamEntry format */
+       entries = talloc_array_p(mem_ctx, struct samr_SamEntry, ldb_cnt);
+       if (!entries) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       count = 0;
+
+       for (i=0;i<ldb_cnt;i++) {
+               struct dom_sid *group_sid;
+
+               group_sid = samdb_result_dom_sid(mem_ctx, res[i],
+                                                "objectSid");
+               if (group_sid == NULL)
+                       continue;
+
+               entries[count].idx =
+                       group_sid->sub_auths[group_sid->num_auths-1];
+               entries[count].name.string =
+                       samdb_result_string(res[i], "sAMAccountName", "");
+               count += 1;
+       }
+
+       /* sort the results by rid */
+       qsort(entries, count, sizeof(struct samr_SamEntry), 
+             (comparison_fn_t)compare_SamEntry);
+
+       /* find the first entry to return */
+       for (first=0;
+            first<count && entries[first].idx <= *r->in.resume_handle;
+            first++) ;
+
+       if (first == count) {
+               return NT_STATUS_OK;
+       }
+
+       /* return the rest, limit by max_size. Note that we 
+          use the w2k3 element size value of 54 */
+       r->out.num_entries = count - first;
+       r->out.num_entries = MIN(r->out.num_entries, 
+                                1+(r->in.max_size/SAMR_ENUM_USERS_MULTIPLIER));
+
+       r->out.sam = talloc_p(mem_ctx, struct samr_SamArray);
+       if (!r->out.sam) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       r->out.sam->entries = entries+first;
+       r->out.sam->count = r->out.num_entries;
+
+       if (r->out.num_entries < count - first) {
+               *r->out.resume_handle = entries[first+r->out.num_entries-1].idx;
+               return STATUS_MORE_ENTRIES;
+       }
+
+       return NT_STATUS_OK;
 }
 
 
@@ -549,7 +697,8 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
        const char *name;
        struct ldb_message msg;
        uint32_t rid;
-       const char *account_name, *sidstr;
+       const char *account_name, *sidstr, *guidstr;
+       struct GUID guid;
        time_t now = time(NULL);
        struct dcesrv_handle *u_handle;
        int ret;
@@ -564,7 +713,7 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
 
        d_state = h->data;
 
-       account_name = r->in.account_name->name;
+       account_name = r->in.account_name->string;
 
        if (account_name == NULL) {
                return NT_STATUS_INVALID_PARAMETER;
@@ -613,7 +762,7 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
                        return NT_STATUS_INTERNAL_DB_CORRUPTION;
                }
 
-               container = "DomainControllers";
+               container = "Domain Controllers";
                additional_class = "computer";
 
        } else if (r->in.acct_flags == ACB_DOMTRUST) {
@@ -625,7 +774,7 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
                        return NT_STATUS_INTERNAL_DB_CORRUPTION;
                }
 
-               container = "ForeignDomains";  /* FIXME: Is this correct?*/
+               container = "Users";
                additional_class = "computer";
 
        } else {
@@ -645,6 +794,13 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
                return NT_STATUS_NO_MEMORY;
        }
 
+       /* a new GUID */
+       guid = GUID_random();
+       guidstr = GUID_string(mem_ctx, &guid);
+       if (!guidstr) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
        /* add core elements to the ldb_message for the user */
        msg.dn = talloc_asprintf(mem_ctx, "CN=%s,CN=%s,%s", account_name, container, d_state->domain_dn);
        if (!msg.dn) {
@@ -658,6 +814,7 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
                samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectClass", additional_class);
        }
        samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectSid", sidstr);
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectGUID", guidstr);
        samdb_msg_set_ldaptime(d_state->sam_ctx, mem_ctx, &msg, "whenCreated", now);
        samdb_msg_set_ldaptime(d_state->sam_ctx, mem_ctx, &msg, "whenChanged", now);
 
@@ -675,18 +832,16 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
        a_state->sam_ctx = d_state->sam_ctx;
        a_state->access_mask = r->in.access_mask;
        a_state->domain_state = talloc_reference(a_state, d_state);
-       a_state->account_dn = talloc_steal(d_state, msg.dn);
-       a_state->account_sid = talloc_strdup(d_state, sidstr);
-       a_state->account_name = talloc_strdup(d_state, account_name);
-       if (!a_state->account_name || !a_state->account_sid) {
-               talloc_free(a_state);
+       a_state->account_dn = talloc_steal(a_state, msg.dn);
+       a_state->account_sid = talloc_steal(a_state, sidstr);
+       a_state->account_name = talloc_strdup(a_state, account_name);
+       if (!a_state->account_name) {
                return NT_STATUS_NO_MEMORY;
        }
 
        /* create the policy handle */
        u_handle = dcesrv_handle_new(dce_call->conn, SAMR_HANDLE_USER);
        if (!u_handle) {
-               talloc_free(a_state);
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -726,14 +881,6 @@ static NTSTATUS samr_CreateUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *
        return samr_CreateUser2(dce_call, mem_ctx, &r2);
 }
 
-/*
-  comparison function for sorting SamEntry array
-*/
-static int compare_SamEntry(struct samr_SamEntry *e1, struct samr_SamEntry *e2)
-{
-       return e1->idx - e2->idx;
-}
-
 /* 
   samr_EnumDomainUsers 
 */
@@ -773,7 +920,7 @@ static NTSTATUS samr_EnumDomainUsers(struct dcesrv_call_state *dce_call, TALLOC_
        }
        for (i=0;i<count;i++) {
                entries[i].idx = samdb_result_rid_from_sid(mem_ctx, res[i], "objectSid", 0);
-               entries[i].name.name = samdb_result_string(res[i], "sAMAccountName", "");
+               entries[i].name.string = samdb_result_string(res[i], "sAMAccountName", "");
        }
 
        /* sort the results by rid */
@@ -818,81 +965,366 @@ static NTSTATUS samr_EnumDomainUsers(struct dcesrv_call_state *dce_call, TALLOC_
 static NTSTATUS samr_CreateDomAlias(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct samr_CreateDomAlias *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
+       struct samr_domain_state *d_state;
+       struct samr_account_state *a_state;
+       struct dcesrv_handle *h;
+       const char *aliasname, *name, *sidstr, *guidstr;
+       struct GUID guid;
+       time_t now = time(NULL);
+       struct ldb_message msg;
+       uint32_t rid;
+       struct dcesrv_handle *a_handle;
+       int ret;
+       NTSTATUS status;
 
+       ZERO_STRUCTP(r->out.alias_handle);
+       *r->out.rid = 0;
 
-/* 
-  samr_EnumDomainAliases 
-*/
-static NTSTATUS samr_EnumDomainAliases(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_EnumDomainAliases *r)
-{
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
+       DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
 
+       d_state = h->data;
 
-/* 
-  samr_GetAliasMembership 
-*/
-static NTSTATUS samr_GetAliasMembership(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_GetAliasMembership *r)
-{
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       aliasname = r->in.aliasname->string;
+
+       if (aliasname == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       /* Check if alias already exists */
+       name = samdb_search_string(d_state->sam_ctx, mem_ctx, NULL,
+                                  "sAMAccountName",
+                                  "(&(sAMAccountName=%s)(objectclass=group))",
+                                  aliasname);
+
+       if (name != NULL) {
+               return NT_STATUS_ALIAS_EXISTS;
+       }
+
+       ZERO_STRUCT(msg);
+
+       /* pull in all the template attributes */
+       ret = samdb_copy_template(d_state->sam_ctx, mem_ctx, &msg, 
+                                 "(&(name=TemplateAlias)"
+                                 "(objectclass=aliasTemplate))");
+       if (ret != 0) {
+               DEBUG(0,("Failed to load TemplateAlias from samdb\n"));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       /* allocate a rid */
+       status = samdb_allocate_next_id(d_state->sam_ctx, mem_ctx, 
+                                       d_state->domain_dn, "nextRid", &rid);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       /* and the group SID */
+       sidstr = talloc_asprintf(mem_ctx, "%s-%u", d_state->domain_sid, rid);
+       if (!sidstr) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* a new GUID */
+       guid = GUID_random();
+       guidstr = GUID_string(mem_ctx, &guid);
+       if (!guidstr) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* add core elements to the ldb_message for the alias */
+       msg.dn = talloc_asprintf(mem_ctx, "CN=%s,CN=Users,%s", aliasname,
+                                d_state->domain_dn);
+       if (!msg.dn) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "name", aliasname);
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "cn", aliasname);
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "sAMAccountName", aliasname);
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectClass", "group");
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectSid", sidstr);
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectGUID", guidstr);
+       samdb_msg_set_ldaptime(d_state->sam_ctx, mem_ctx, &msg, "whenCreated", now);
+       samdb_msg_set_ldaptime(d_state->sam_ctx, mem_ctx, &msg, "whenChanged", now);
+
+       /* create the alias */
+       ret = samdb_add(d_state->sam_ctx, mem_ctx, &msg);
+       if (ret != 0) {
+               DEBUG(0,("Failed to create alias record %s\n", msg.dn));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       a_state = talloc_p(d_state, struct samr_account_state);
+       if (!a_state) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       a_state->sam_ctx = d_state->sam_ctx;
+       a_state->access_mask = r->in.access_mask;
+       a_state->domain_state = talloc_reference(a_state, d_state);
+       a_state->account_dn = talloc_steal(a_state, msg.dn);
+       a_state->account_sid = talloc_steal(a_state, sidstr);
+       a_state->account_name = talloc_strdup(a_state, aliasname);
+       if (!a_state->account_name) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* create the policy handle */
+       a_handle = dcesrv_handle_new(dce_call->conn, SAMR_HANDLE_ALIAS);
+       if (a_handle == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       a_handle->data = a_state;
+       a_handle->destroy = samr_handle_destroy;
+
+       *r->out.alias_handle = a_handle->wire_handle;
+       *r->out.rid = rid;
+
+       return NT_STATUS_OK;
 }
 
 
 /* 
-  samr_LookupNames 
+  samr_EnumDomainAliases 
 */
-static NTSTATUS samr_LookupNames(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                                struct samr_LookupNames *r)
+static NTSTATUS samr_EnumDomainAliases(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_EnumDomainAliases *r)
 {
        struct dcesrv_handle *h;
        struct samr_domain_state *d_state;
-       int i;
-       NTSTATUS status = NT_STATUS_OK;
-       const char * const attrs[] = { "sAMAccountType", "objectSid", NULL };
-       int count;
+       struct ldb_message **res;
+       int ldb_cnt, count, i, first;
+       struct samr_SamEntry *entries;
+       const char * const attrs[3] = { "objectSid", "sAMAccountName", NULL };
+       struct dom_sid *domain_sid;
 
-       ZERO_STRUCT(r->out.rids);
-       ZERO_STRUCT(r->out.types);
+       *r->out.resume_handle = 0;
+       r->out.sam = NULL;
+       r->out.num_entries = 0;
 
        DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
 
        d_state = h->data;
 
-       if (r->in.num_names == 0) {
+       domain_sid = dom_sid_parse_talloc(mem_ctx, d_state->domain_sid);
+       if (domain_sid == NULL)
+               return NT_STATUS_NO_MEMORY;
+       
+       /* search for all domain groups in this domain. This could possibly be
+          cached and resumed based on resume_key */
+       ldb_cnt = samdb_search_domain(d_state->sam_ctx, mem_ctx,
+                                     d_state->domain_dn,
+                                     &res, attrs, domain_sid,
+                                     "(&(|(grouptype=%s)(grouptype=%s)))"
+                                     "(objectclass=group))",
+                                     ldb_hexstr(mem_ctx,
+                                                GTYPE_SECURITY_BUILTIN_LOCAL_GROUP),
+                                     ldb_hexstr(mem_ctx,
+                                                GTYPE_SECURITY_DOMAIN_LOCAL_GROUP));
+       if (ldb_cnt == -1) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+       if (ldb_cnt == 0) {
                return NT_STATUS_OK;
        }
 
-       r->out.rids.ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_names);
-       r->out.types.ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_names);
-       if (!r->out.rids.ids || !r->out.types.ids) {
+       /* convert to SamEntry format */
+       entries = talloc_array_p(mem_ctx, struct samr_SamEntry, ldb_cnt);
+       if (!entries) {
                return NT_STATUS_NO_MEMORY;
        }
-       r->out.rids.count = r->in.num_names;
-       r->out.types.count = r->in.num_names;
 
-       for (i=0;i<r->in.num_names;i++) {
-               struct ldb_message **res;
-               struct dom_sid2 *sid;
-               const char *sidstr;
-               uint32_t atype, rtype;
+       count = 0;
 
-               r->out.rids.ids[i] = 0;
-               r->out.types.ids[i] = SID_NAME_UNKNOWN;
+       for (i=0;i<ldb_cnt;i++) {
+               struct dom_sid *alias_sid;
 
-               count = samdb_search(d_state->sam_ctx, mem_ctx, d_state->domain_dn, &res, attrs, 
-                                    "sAMAccountName=%s", r->in.names[i].name);
-               if (count != 1) {
-                       status = STATUS_SOME_UNMAPPED;
-                       continue;
-               }
+               alias_sid = samdb_result_dom_sid(mem_ctx, res[i],
+                                                "objectSid");
 
-               sidstr = samdb_result_string(res[0], "objectSid", NULL);
-               if (sidstr == NULL) {
-                       status = STATUS_SOME_UNMAPPED;
+               if (alias_sid == NULL)
+                       continue;
+
+               entries[count].idx =
+                       alias_sid->sub_auths[alias_sid->num_auths-1];
+               entries[count].name.string =
+                       samdb_result_string(res[i], "sAMAccountName", "");
+               count += 1;
+       }
+
+       /* sort the results by rid */
+       qsort(entries, count, sizeof(struct samr_SamEntry), 
+             (comparison_fn_t)compare_SamEntry);
+
+       /* find the first entry to return */
+       for (first=0;
+            first<count && entries[first].idx <= *r->in.resume_handle;
+            first++) ;
+
+       if (first == count) {
+               return NT_STATUS_OK;
+       }
+
+       r->out.num_entries = count - first;
+       r->out.num_entries = MIN(r->out.num_entries, 1000);
+
+       r->out.sam = talloc_p(mem_ctx, struct samr_SamArray);
+       if (!r->out.sam) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       r->out.sam->entries = entries+first;
+       r->out.sam->count = r->out.num_entries;
+
+       if (r->out.num_entries < count - first) {
+               *r->out.resume_handle =
+                       entries[first+r->out.num_entries-1].idx;
+               return STATUS_MORE_ENTRIES;
+       }
+
+       return NT_STATUS_OK;
+}
+
+
+/* 
+  samr_GetAliasMembership 
+*/
+static NTSTATUS samr_GetAliasMembership(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_GetAliasMembership *r)
+{
+       struct dcesrv_handle *h;
+       struct samr_domain_state *d_state;
+       struct ldb_message **res;
+       struct dom_sid *domain_sid;
+       int i, count = 0;
+
+       DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
+
+       d_state = h->data;
+
+       if (r->in.sids->num_sids > 0) {
+               const char *filter;
+               const char * const attrs[2] = { "objectSid", NULL };
+
+               filter = talloc_asprintf(mem_ctx,
+                                        "(&(|(grouptype=%s)(grouptype=%s))"
+                                        "(objectclass=group)(|",
+                                        ldb_hexstr(mem_ctx,
+                                                   GTYPE_SECURITY_BUILTIN_LOCAL_GROUP),
+                                        ldb_hexstr(mem_ctx,
+                                                   GTYPE_SECURITY_DOMAIN_LOCAL_GROUP));
+               if (filter == NULL)
+                       return NT_STATUS_NO_MEMORY;
+
+               for (i=0; i<r->in.sids->num_sids; i++) {
+                       const char *sidstr, *memberdn;
+
+                       sidstr = dom_sid_string(mem_ctx,
+                                               r->in.sids->sids[i].sid);
+                       if (sidstr == NULL)
+                               return NT_STATUS_NO_MEMORY;
+
+                       memberdn = samdb_search_string(d_state->sam_ctx,
+                                                      mem_ctx, NULL, "dn",
+                                                      "(objectSid=%s)",
+                                                      sidstr);
+
+                       if (memberdn == NULL)
+                               continue;
+
+                       filter = talloc_asprintf(mem_ctx, "%s(member=%s)",
+                                                filter, memberdn);
+                       if (filter == NULL)
+                               return NT_STATUS_NO_MEMORY;
+               }
+
+               domain_sid = dom_sid_parse_talloc(mem_ctx,
+                                                 d_state->domain_sid);
+               if (domain_sid == NULL)
+                       return NT_STATUS_NO_MEMORY;
+
+               count = samdb_search_domain(d_state->sam_ctx, mem_ctx,
+                                           d_state->domain_dn, &res, attrs,
+                                           domain_sid, "%s))", filter);
+               if (count < 0)
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       r->out.rids->count = 0;
+       r->out.rids->ids = talloc_array_p(mem_ctx, uint32_t, count);
+       if (r->out.rids->ids == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       for (i=0; i<count; i++) {
+               struct dom_sid *alias_sid;
+
+               alias_sid = samdb_result_dom_sid(mem_ctx, res[i], "objectSid");
+
+               if (alias_sid == NULL) {
+                       DEBUG(0, ("Could not find objectSid\n"));
+                       continue;
+               }
+
+               r->out.rids->ids[r->out.rids->count] =
+                       alias_sid->sub_auths[alias_sid->num_auths-1];
+               r->out.rids->count += 1;
+       }
+
+       return NT_STATUS_OK;
+}
+
+
+/* 
+  samr_LookupNames 
+*/
+static NTSTATUS samr_LookupNames(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                                struct samr_LookupNames *r)
+{
+       struct dcesrv_handle *h;
+       struct samr_domain_state *d_state;
+       int i;
+       NTSTATUS status = NT_STATUS_OK;
+       const char * const attrs[] = { "sAMAccountType", "objectSid", NULL };
+       int count;
+
+       ZERO_STRUCT(r->out.rids);
+       ZERO_STRUCT(r->out.types);
+
+       DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
+
+       d_state = h->data;
+
+       if (r->in.num_names == 0) {
+               return NT_STATUS_OK;
+       }
+
+       r->out.rids.ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_names);
+       r->out.types.ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_names);
+       if (!r->out.rids.ids || !r->out.types.ids) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       r->out.rids.count = r->in.num_names;
+       r->out.types.count = r->in.num_names;
+
+       for (i=0;i<r->in.num_names;i++) {
+               struct ldb_message **res;
+               struct dom_sid2 *sid;
+               const char *sidstr;
+               uint32_t atype, rtype;
+
+               r->out.rids.ids[i] = 0;
+               r->out.types.ids[i] = SID_NAME_UNKNOWN;
+
+               count = samdb_search(d_state->sam_ctx, mem_ctx, d_state->domain_dn, &res, attrs, 
+                                    "sAMAccountName=%s", r->in.names[i].string);
+               if (count != 1) {
+                       status = STATUS_SOME_UNMAPPED;
+                       continue;
+               }
+
+               sidstr = samdb_result_string(res[0], "objectSid", NULL);
+               if (sidstr == NULL) {
+                       status = STATUS_SOME_UNMAPPED;
                        continue;
                }
                
@@ -930,7 +1362,71 @@ static NTSTATUS samr_LookupNames(struct dcesrv_call_state *dce_call, TALLOC_CTX
 static NTSTATUS samr_LookupRids(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct samr_LookupRids *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct dcesrv_handle *h;
+       struct samr_domain_state *d_state;
+       int i;
+       NTSTATUS status = NT_STATUS_OK;
+       struct samr_String *names;
+       uint32_t *ids;
+
+       ZERO_STRUCT(r->out.names);
+       ZERO_STRUCT(r->out.types);
+
+       DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
+
+       d_state = h->data;
+
+       if (r->in.num_rids == 0)
+               return NT_STATUS_OK;
+
+       names = talloc_array_p(mem_ctx, struct samr_String, r->in.num_rids);
+       ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_rids);
+
+       if ((names == NULL) || (ids == NULL))
+               return NT_STATUS_NO_MEMORY;
+
+       for (i=0; i<r->in.num_rids; i++) {
+               struct ldb_message **res;
+               int count;
+               const char * const attrs[] = {  "sAMAccountType",
+                                               "sAMAccountName", NULL };
+               uint32_t atype;
+
+               ids[i] = SID_NAME_UNKNOWN;
+
+               count = samdb_search(d_state->sam_ctx, mem_ctx,
+                                    d_state->domain_dn, &res, attrs,
+                                    "(objectSid=%s-%u)", d_state->domain_sid,
+                                    r->in.rids[i]);
+               if (count != 1) {
+                       status = STATUS_SOME_UNMAPPED;
+                       continue;
+               }
+
+               names[i].string = samdb_result_string(res[0], "sAMAccountName",
+                                                     NULL);
+               
+               atype = samdb_result_uint(res[0], "sAMAccountType", 0);
+               if (atype == 0) {
+                       status = STATUS_SOME_UNMAPPED;
+                       continue;
+               }
+
+               ids[i] = samdb_atype_map(atype);
+               
+               if (ids[i] == SID_NAME_UNKNOWN) {
+                       status = STATUS_SOME_UNMAPPED;
+                       continue;
+               }
+       }
+
+       r->out.names.names = names;
+       r->out.names.count = r->in.num_rids;
+
+       r->out.types.ids = ids;
+       r->out.types.count = r->in.num_rids;
+
+       return status;
 }
 
 
@@ -964,8 +1460,10 @@ static NTSTATUS samr_OpenGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
        /* search for the group record */
        ret = samdb_search(d_state->sam_ctx,
                           mem_ctx, d_state->domain_dn, &msgs, attrs,
-                          "(&(objectSid=%s)(objectclass=group))", 
-                          sidstr);
+                          "(&(objectSid=%s)(objectclass=group)"
+                          "(grouptype=%s))",
+                          sidstr, ldb_hexstr(mem_ctx,
+                                             GTYPE_SECURITY_GLOBAL_GROUP));
        if (ret == 0) {
                return NT_STATUS_NO_SUCH_GROUP;
        }
@@ -988,9 +1486,9 @@ static NTSTATUS samr_OpenGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
        a_state->access_mask = r->in.access_mask;
        a_state->domain_state = talloc_reference(a_state, d_state);
        a_state->account_dn = talloc_steal(a_state, msgs[0]->dn);
-       a_state->account_sid = talloc_strdup(a_state, sidstr);
+       a_state->account_sid = talloc_steal(a_state, sidstr);
        a_state->account_name = talloc_strdup(a_state, groupname);
-       if (!a_state->account_name || !a_state->account_sid) {
+       if (!a_state->account_name) {
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -1052,7 +1550,7 @@ static NTSTATUS samr_OpenGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
 } while (0)
 
 #define SET_LHOURS(msg, field, attr) do { \
-       if (samdb_msg_add_logon_hours(a_state->sam_ctx, mem_ctx, msg, attr, r->in.info->field) != 0) { \
+       if (samdb_msg_add_logon_hours(a_state->sam_ctx, mem_ctx, msg, attr, &r->in.info->field) != 0) { \
                return NT_STATUS_NO_MEMORY; \
        } \
 } while (0)
@@ -1094,19 +1592,429 @@ static NTSTATUS samr_QueryGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_C
        /* Fill in the level */
        switch (r->in.level) {
        case GroupInfoAll:
-               QUERY_STRING(msg, all.name.name,        "sAMAccountName");
-               r->out.info->all.unknown = 7; /* Do like w2k3 */
+               QUERY_STRING(msg, all.name.string,        "sAMAccountName");
+               r->out.info->all.attributes = 7; /* Do like w2k3 */
                QUERY_UINT  (msg, all.num_members,      "numMembers")
-               QUERY_STRING(msg, all.description.name, "description");
+               QUERY_STRING(msg, all.description.string, "description");
                break;
        case GroupInfoName:
-               QUERY_STRING(msg, name.name,            "sAMAccountName");
+               QUERY_STRING(msg, name.string,            "sAMAccountName");
                break;
        case GroupInfoX:
                r->out.info->unknown.unknown = 7;
                break;
-       case GroupInfoDescription:
-               QUERY_STRING(msg, description.name, "description");
+       case GroupInfoDescription:
+               QUERY_STRING(msg, description.string, "description");
+               break;
+       default:
+               r->out.info = NULL;
+               return NT_STATUS_INVALID_INFO_CLASS;
+       }
+       
+       return NT_STATUS_OK;
+}
+
+
+/* 
+  samr_SetGroupInfo 
+*/
+static NTSTATUS samr_SetGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_SetGroupInfo *r)
+{
+       struct dcesrv_handle *h;
+       struct samr_account_state *a_state;
+       struct ldb_message mod, *msg = &mod;
+       int ret;
+
+       DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
+
+       a_state = h->data;
+
+       ZERO_STRUCT(mod);
+       mod.dn = talloc_strdup(mem_ctx, a_state->account_dn);
+       if (!mod.dn) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       switch (r->in.level) {
+       case GroupInfoDescription:
+               SET_STRING(msg, description.string,         "description");
+               break;
+       case GroupInfoName:
+               /* On W2k3 this does not change the name, it changes the
+                * sAMAccountName attribute */
+               SET_STRING(msg, name.string,                "sAMAccountName");
+               break;
+       case GroupInfoX:
+               /* This does not do anything obviously visible in W2k3 LDAP */
+               break;
+       default:
+               return NT_STATUS_INVALID_INFO_CLASS;
+       }
+
+       /* modify the samdb record */
+       ret = samdb_replace(a_state->sam_ctx, mem_ctx, &mod);
+       if (ret != 0) {
+               /* we really need samdb.c to return NTSTATUS */
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       return NT_STATUS_OK;
+}
+
+
+/* 
+  samr_AddGroupMember 
+*/
+static NTSTATUS samr_AddGroupMember(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_AddGroupMember *r)
+{
+       struct dcesrv_handle *h;
+       struct samr_account_state *a_state;
+       struct samr_domain_state *d_state;
+       struct ldb_message mod;
+       char *membersidstr;
+       const char *memberdn;
+       struct ldb_message **msgs;
+       const char * const attrs[2] = { "dn", NULL };
+       int ret;
+
+       DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
+
+       a_state = h->data;
+       d_state = a_state->domain_state;
+
+       membersidstr = talloc_asprintf(mem_ctx, "%s-%u", d_state->domain_sid,
+                                      r->in.rid);
+       if (membersidstr == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       /* In native mode, AD can also nest domain groups. Not sure yet
+        * whether this is also available via RPC. */
+       ret = samdb_search(d_state->sam_ctx, mem_ctx, d_state->domain_dn,
+                          &msgs, attrs, "(&(objectSid=%s)(objectclass=user))",
+                          membersidstr);
+
+       if (ret == 0)
+               return NT_STATUS_NO_SUCH_USER;
+
+       if (ret > 1)
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+       memberdn = samdb_result_string(msgs[0], "dn", NULL);
+
+       if (memberdn == NULL)
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+       ZERO_STRUCT(mod);
+       mod.dn = talloc_reference(mem_ctx, a_state->account_dn);
+
+       if (samdb_msg_add_addval(d_state->sam_ctx, mem_ctx, &mod, "member",
+                                memberdn) != 0)
+               return NT_STATUS_UNSUCCESSFUL;
+
+       if (samdb_modify(a_state->sam_ctx, mem_ctx, &mod) != 0)
+               return NT_STATUS_UNSUCCESSFUL;
+
+       return NT_STATUS_OK;
+}
+
+
+/* 
+  samr_DeleteDomainGroup 
+*/
+static NTSTATUS samr_DeleteDomainGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_DeleteDomainGroup *r)
+{
+       struct dcesrv_handle *h;
+       struct samr_account_state *a_state;
+       int ret;
+
+        *r->out.group_handle = *r->in.group_handle;
+
+       DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
+
+       a_state = h->data;
+
+       ret = samdb_delete(a_state->sam_ctx, mem_ctx, a_state->account_dn);
+       if (ret != 0) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       ZERO_STRUCTP(r->out.group_handle);
+
+       return NT_STATUS_OK;
+}
+
+
+/* 
+  samr_DeleteGroupMember 
+*/
+static NTSTATUS samr_DeleteGroupMember(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_DeleteGroupMember *r)
+{
+       struct dcesrv_handle *h;
+       struct samr_account_state *a_state;
+       struct samr_domain_state *d_state;
+       struct ldb_message mod;
+       char *membersidstr;
+       const char *memberdn;
+       struct ldb_message **msgs;
+       const char * const attrs[2] = { "dn", NULL };
+       int ret;
+
+       DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
+
+       a_state = h->data;
+       d_state = a_state->domain_state;
+
+       membersidstr = talloc_asprintf(mem_ctx, "%s-%u", d_state->domain_sid,
+                                      r->in.rid);
+       if (membersidstr == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       /* In native mode, AD can also nest domain groups. Not sure yet
+        * whether this is also available via RPC. */
+       ret = samdb_search(d_state->sam_ctx, mem_ctx, d_state->domain_dn,
+                          &msgs, attrs, "(&(objectSid=%s)(objectclass=user))",
+                          membersidstr);
+
+       if (ret == 0)
+               return NT_STATUS_NO_SUCH_USER;
+
+       if (ret > 1)
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+       memberdn = samdb_result_string(msgs[0], "dn", NULL);
+
+       if (memberdn == NULL)
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+       ZERO_STRUCT(mod);
+       mod.dn = talloc_reference(mem_ctx, a_state->account_dn);
+
+       if (samdb_msg_add_delval(d_state->sam_ctx, mem_ctx, &mod, "member",
+                                memberdn) != 0)
+               return NT_STATUS_UNSUCCESSFUL;
+
+       if (samdb_modify(a_state->sam_ctx, mem_ctx, &mod) != 0)
+               return NT_STATUS_UNSUCCESSFUL;
+
+       return NT_STATUS_OK;
+}
+
+
+/* 
+  samr_QueryGroupMember 
+*/
+static NTSTATUS samr_QueryGroupMember(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_QueryGroupMember *r)
+{
+       struct dcesrv_handle *h;
+       struct samr_account_state *a_state;
+       struct ldb_message **res;
+       struct ldb_message_element *el;
+       struct samr_ridArray *array;
+       const char * const attrs[2] = { "member", NULL };
+       int ret;
+
+       DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
+
+       a_state = h->data;
+
+       /* pull the member attribute */
+       ret = samdb_search(a_state->sam_ctx, mem_ctx, NULL, &res, attrs,
+                          "dn=%s", a_state->account_dn);
+
+       if (ret != 1) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       array = talloc_p(mem_ctx, struct samr_ridArray);
+
+       if (array == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       ZERO_STRUCTP(array);
+
+       el = ldb_msg_find_element(res[0], "member");
+
+       if (el != NULL) {
+               int i;
+
+               array->count = el->num_values;
+
+               array->rids = talloc_array_p(mem_ctx, uint32,
+                                            el->num_values);
+               if (array->rids == NULL)
+                       return NT_STATUS_NO_MEMORY;
+
+               array->unknown = talloc_array_p(mem_ctx, uint32,
+                                               el->num_values);
+               if (array->unknown == NULL)
+                       return NT_STATUS_NO_MEMORY;
+
+               for (i=0; i<el->num_values; i++) {
+                       struct ldb_message **res2;
+                       const char * const attrs2[2] = { "objectSid", NULL };
+                       ret = samdb_search(a_state->sam_ctx, mem_ctx, NULL,
+                                          &res2, attrs2, "dn=%s",
+                                          (char *)el->values[i].data);
+                       if (ret != 1)
+                               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+                       array->rids[i] =
+                               samdb_result_rid_from_sid(mem_ctx, res2[0],
+                                                         "objectSid", 0);
+
+                       if (array->rids[i] == 0)
+                               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+                       array->unknown[i] = 7; /* Not sure what this is.. */
+               }
+       }
+
+       r->out.rids = array;
+
+       return NT_STATUS_OK;
+}
+
+
+/* 
+  samr_SetMemberAttributesOfGroup 
+*/
+static NTSTATUS samr_SetMemberAttributesOfGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_SetMemberAttributesOfGroup *r)
+{
+       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+}
+
+
+/* 
+  samr_OpenAlias 
+*/
+static NTSTATUS samr_OpenAlias(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_OpenAlias *r)
+{
+       struct samr_domain_state *d_state;
+       struct samr_account_state *a_state;
+       struct dcesrv_handle *h;
+       const char *aliasname, *sidstr;
+       struct ldb_message **msgs;
+       struct dcesrv_handle *g_handle;
+       const char * const attrs[2] = { "sAMAccountName", NULL };
+       int ret;
+
+       ZERO_STRUCTP(r->out.alias_handle);
+
+       DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
+
+       d_state = h->data;
+
+       /* form the alias SID */
+       sidstr = talloc_asprintf(mem_ctx, "%s-%u", d_state->domain_sid,
+                                r->in.rid);
+       if (sidstr == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       /* search for the group record */
+       ret = samdb_search(d_state->sam_ctx,
+                          mem_ctx, d_state->domain_dn, &msgs, attrs,
+                          "(&(objectSid=%s)(objectclass=group)"
+                          "(|(grouptype=%s)(grouptype=%s)))",
+                          sidstr,
+                          ldb_hexstr(mem_ctx,
+                                     GTYPE_SECURITY_BUILTIN_LOCAL_GROUP),
+                          ldb_hexstr(mem_ctx,
+                                     GTYPE_SECURITY_DOMAIN_LOCAL_GROUP));
+       if (ret == 0) {
+               return NT_STATUS_NO_SUCH_ALIAS;
+       }
+       if (ret != 1) {
+               DEBUG(0,("Found %d records matching sid %s\n", ret, sidstr));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       aliasname = samdb_result_string(msgs[0], "sAMAccountName", NULL);
+       if (aliasname == NULL) {
+               DEBUG(0,("sAMAccountName field missing for sid %s\n", sidstr));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       a_state = talloc_p(d_state, struct samr_account_state);
+       if (!a_state) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       a_state->sam_ctx = d_state->sam_ctx;
+       a_state->access_mask = r->in.access_mask;
+       a_state->domain_state = talloc_reference(a_state, d_state);
+       a_state->account_dn = talloc_steal(a_state, msgs[0]->dn);
+       a_state->account_sid = talloc_steal(a_state, sidstr);
+       a_state->account_name = talloc_strdup(a_state, aliasname);
+       if (!a_state->account_name) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* create the policy handle */
+       g_handle = dcesrv_handle_new(dce_call->conn, SAMR_HANDLE_ALIAS);
+       if (!g_handle) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       g_handle->data = a_state;
+       g_handle->destroy = samr_handle_destroy;
+
+       *r->out.alias_handle = g_handle->wire_handle;
+
+       return NT_STATUS_OK;
+}
+
+
+/* 
+  samr_QueryAliasInfo 
+*/
+static NTSTATUS samr_QueryAliasInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_QueryAliasInfo *r)
+{
+       struct dcesrv_handle *h;
+       struct samr_account_state *a_state;
+       struct ldb_message *msg, **res;
+       const char * const attrs[4] = { "sAMAccountName", "description",
+                                       "numMembers", NULL };
+       int ret;
+
+       r->out.info = NULL;
+
+       DCESRV_PULL_HANDLE(h, r->in.alias_handle, SAMR_HANDLE_ALIAS);
+
+       a_state = h->data;
+
+       /* pull all the alias attributes */
+       ret = samdb_search(a_state->sam_ctx, mem_ctx, NULL, &res, attrs,
+                          "dn=%s", a_state->account_dn);
+       if (ret != 1) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+       msg = res[0];
+
+       /* allocate the info structure */
+       r->out.info = talloc_p(mem_ctx, union samr_AliasInfo);
+       if (r->out.info == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       ZERO_STRUCTP(r->out.info);
+
+       switch(r->in.level) {
+       case AliasInfoAll:
+               QUERY_STRING(msg, all.name.string, "sAMAccountName");
+               QUERY_UINT  (msg, all.num_members, "numMembers");
+               QUERY_STRING(msg, all.description.string, "description");
+               break;
+       case AliasInfoName:
+               QUERY_STRING(msg, name.string, "sAMAccountName");
+               break;
+       case AliasInfoDescription:
+               QUERY_STRING(msg, description.string, "description");
                break;
        default:
                r->out.info = NULL;
@@ -1118,17 +2026,17 @@ static NTSTATUS samr_QueryGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_C
 
 
 /* 
-  samr_SetGroupInfo 
+  samr_SetAliasInfo 
 */
-static NTSTATUS samr_SetGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_SetGroupInfo *r)
+static NTSTATUS samr_SetAliasInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_SetAliasInfo *r)
 {
        struct dcesrv_handle *h;
        struct samr_account_state *a_state;
        struct ldb_message mod, *msg = &mod;
        int ret;
 
-       DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
+       DCESRV_PULL_HANDLE(h, r->in.alias_handle, SAMR_HANDLE_ALIAS);
 
        a_state = h->data;
 
@@ -1139,16 +2047,13 @@ static NTSTATUS samr_SetGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
        }
 
        switch (r->in.level) {
-       case GroupInfoDescription:
-               SET_STRING(msg, description.name,         "description");
+       case AliasInfoDescription:
+               SET_STRING(msg, description.string,         "description");
                break;
-       case GroupInfoName:
+       case AliasInfoName:
                /* On W2k3 this does not change the name, it changes the
                 * sAMAccountName attribute */
-               SET_STRING(msg, name.name,                "sAMAccountName");
-               break;
-       case GroupInfoX:
-               /* This does not do anything obviously visible in W2k3 LDAP */
+               SET_STRING(msg, name.string,                "sAMAccountName");
                break;
        default:
                return NT_STATUS_INVALID_INFO_CLASS;
@@ -1166,119 +2071,141 @@ static NTSTATUS samr_SetGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
 
 
 /* 
-  samr_AddGroupMember 
+  samr_DeleteDomAlias 
 */
-static NTSTATUS samr_AddGroupMember(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_AddGroupMember *r)
+static NTSTATUS samr_DeleteDomAlias(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_DeleteDomAlias *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
 }
 
 
 /* 
-  samr_DeleteDomainGroup 
+  samr_AddAliasMember 
 */
-static NTSTATUS samr_DeleteDomainGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_DeleteDomainGroup *r)
+static NTSTATUS samr_AddAliasMember(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_AddAliasMember *r)
 {
        struct dcesrv_handle *h;
        struct samr_account_state *a_state;
+       struct samr_domain_state *d_state;
+       const char *sidstr;
+       struct ldb_message mod;
+       struct ldb_message **msgs;
+       const char * const attrs[2] = { "dn", NULL };
+       const char *memberdn = NULL;
        int ret;
 
-        *r->out.group_handle = *r->in.group_handle;
-
-       DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
+       DCESRV_PULL_HANDLE(h, r->in.alias_handle, SAMR_HANDLE_ALIAS);
 
        a_state = h->data;
+       d_state = a_state->domain_state;
 
-       ret = samdb_delete(a_state->sam_ctx, mem_ctx, a_state->account_dn);
-       if (ret != 0) {
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       ZERO_STRUCTP(r->out.group_handle);
-
-       return NT_STATUS_OK;
-}
-
+       sidstr = dom_sid_string(mem_ctx, r->in.sid);
+       if (sidstr == NULL)
+               return NT_STATUS_INVALID_PARAMETER;
 
-/* 
-  samr_DeleteGroupMember 
-*/
-static NTSTATUS samr_DeleteGroupMember(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_DeleteGroupMember *r)
-{
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
+       ret = samdb_search(d_state->sam_ctx, mem_ctx, NULL,
+                          &msgs, attrs, "(objectsid=%s)", sidstr);
 
+       if (ret == 1) {
+               memberdn = ldb_msg_find_string(msgs[0], "dn", NULL);
+       } else  if (ret > 1) {
+               DEBUG(0,("Found %d records matching sid %s\n", ret, sidstr));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       } else if (ret == 0) {
+               struct ldb_message msg;
+               struct GUID guid;
+               const char *guidstr, *basedn;
 
-/* 
-  samr_QueryGroupMember 
-*/
-static NTSTATUS samr_QueryGroupMember(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_QueryGroupMember *r)
-{
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
+               /* We might have to create a ForeignSecurityPrincipal, but
+                * only if it's not our own domain */
+               if (dom_sid_in_domain(dom_sid_parse_talloc(mem_ctx,
+                                                          d_state->domain_sid),
+                                     r->in.sid))
+                       return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 
+               ZERO_STRUCT(msg);
 
-/* 
-  samr_SetMemberAttributesOfGroup 
-*/
-static NTSTATUS samr_SetMemberAttributesOfGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_SetMemberAttributesOfGroup *r)
-{
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
+               /* pull in all the template attributes */
+               ret = samdb_copy_template(d_state->sam_ctx, mem_ctx, &msg, 
+                                         "(&(name=TemplateForeignSecurityPrincipal)"
+                                         "(objectclass=foreignSecurityPrincipalTemplate))");
+               if (ret != 0) {
+                       DEBUG(0,("Failed to load "
+                                "TemplateForeignSecurityPrincipal "
+                                "from samdb\n"));
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
 
+               /* a new GUID */
+               guid = GUID_random();
+               guidstr = GUID_string(mem_ctx, &guid);
+               if (!guidstr) {
+                       return NT_STATUS_NO_MEMORY;
+               }
 
-/* 
-  samr_OpenAlias 
-*/
-static NTSTATUS samr_OpenAlias(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_OpenAlias *r)
-{
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
+               /* TODO: Hmmm. This feels wrong. How do I find the base dn to
+                * put the ForeignSecurityPrincipals? d_state->domain_dn does
+                * not work, this is wrong for the Builtin domain, there's no
+                * cn=For...,cn=Builtin,dc={BASEDN}.  -- vl
+                */
 
+               basedn = samdb_search_string(d_state->sam_ctx, mem_ctx, NULL,
+                                            "dn",
+                                            "(&(objectClass=container)"
+                                            "(cn=ForeignSecurityPrincipals))");
 
-/* 
-  samr_QueryAliasInfo 
-*/
-static NTSTATUS samr_QueryAliasInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_QueryAliasInfo *r)
-{
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
+               if (basedn == NULL) {
+                       DEBUG(0, ("Failed to find DN for "
+                                 "ForeignSecurityPrincipal container\n"));
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
 
+               /* add core elements to the ldb_message for the alias */
+               msg.dn = talloc_asprintf(mem_ctx, "CN=%s,%s", sidstr, basedn);
+               if (msg.dn == NULL)
+                       return NT_STATUS_NO_MEMORY;
+
+               memberdn = msg.dn;
+
+               samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
+                                    "name", sidstr);
+               samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
+                                    "objectClass",
+                                    "foreignSecurityPrincipal");
+               samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
+                                    "objectSid", sidstr);
+               samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
+                                    "objectGUID", guidstr);
+               
+               /* create the alias */
+               ret = samdb_add(d_state->sam_ctx, mem_ctx, &msg);
+               if (ret != 0) {
+                       DEBUG(0,("Failed to create foreignSecurityPrincipal "
+                                "record %s\n", msg.dn));
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
+       } else {
+               DEBUG(0, ("samdb_search returned %d\n", ret));
+       }
 
-/* 
-  samr_SetAliasInfo 
-*/
-static NTSTATUS samr_SetAliasInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_SetAliasInfo *r)
-{
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
+       if (memberdn == NULL) {
+               DEBUG(0, ("Could not find memberdn\n"));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
 
+       ZERO_STRUCT(mod);
+       mod.dn = talloc_reference(mem_ctx, a_state->account_dn);
 
-/* 
-  samr_DeleteDomAlias 
-*/
-static NTSTATUS samr_DeleteDomAlias(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_DeleteDomAlias *r)
-{
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
+       if (samdb_msg_add_addval(d_state->sam_ctx, mem_ctx, &mod, "member",
+                                memberdn) != 0)
+               return NT_STATUS_UNSUCCESSFUL;
 
+       if (samdb_modify(a_state->sam_ctx, mem_ctx, &mod) != 0)
+               return NT_STATUS_UNSUCCESSFUL;
 
-/* 
-  samr_AddAliasMember 
-*/
-static NTSTATUS samr_AddAliasMember(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_AddAliasMember *r)
-{
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       return NT_STATUS_OK;
 }
 
 
@@ -1288,7 +2215,39 @@ static NTSTATUS samr_AddAliasMember(struct dcesrv_call_state *dce_call, TALLOC_C
 static NTSTATUS samr_DeleteAliasMember(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct samr_DeleteAliasMember *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct dcesrv_handle *h;
+       struct samr_account_state *a_state;
+       struct samr_domain_state *d_state;
+       const char *sidstr;
+       struct ldb_message mod;
+       const char *memberdn;
+
+       DCESRV_PULL_HANDLE(h, r->in.alias_handle, SAMR_HANDLE_ALIAS);
+
+       a_state = h->data;
+       d_state = a_state->domain_state;
+
+       sidstr = dom_sid_string(mem_ctx, r->in.sid);
+       if (sidstr == NULL)
+               return NT_STATUS_INVALID_PARAMETER;
+
+       memberdn = samdb_search_string(d_state->sam_ctx, mem_ctx, NULL,
+                                      "dn", "(objectSid=%s)", sidstr);
+
+       if (memberdn == NULL)
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+       ZERO_STRUCT(mod);
+       mod.dn = talloc_reference(mem_ctx, a_state->account_dn);
+
+       if (samdb_msg_add_delval(d_state->sam_ctx, mem_ctx, &mod, "member",
+                                memberdn) != 0)
+               return NT_STATUS_UNSUCCESSFUL;
+
+       if (samdb_modify(a_state->sam_ctx, mem_ctx, &mod) != 0)
+               return NT_STATUS_UNSUCCESSFUL;
+
+       return NT_STATUS_OK;
 }
 
 
@@ -1298,9 +2257,61 @@ static NTSTATUS samr_DeleteAliasMember(struct dcesrv_call_state *dce_call, TALLO
 static NTSTATUS samr_GetMembersInAlias(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct samr_GetMembersInAlias *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
+       struct dcesrv_handle *h;
+       struct samr_account_state *a_state;
+       struct samr_domain_state *d_state;
+       struct ldb_message **msgs;
+       struct lsa_SidPtr *sids;
+       struct ldb_message_element *el;
+       const char * const attrs[2] = { "member", NULL};
+       int ret;
+
+       DCESRV_PULL_HANDLE(h, r->in.alias_handle, SAMR_HANDLE_ALIAS);
+
+       a_state = h->data;
+       d_state = a_state->domain_state;
+
+       ret = samdb_search(d_state->sam_ctx, mem_ctx, NULL, &msgs, attrs,
+                          "dn=%s", a_state->account_dn);
+
+       if (ret != 1)
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+       r->out.sids->num_sids = 0;
+       r->out.sids->sids = NULL;
+
+       el = ldb_msg_find_element(msgs[0], "member");
+
+       if (el != NULL) {
+               int i;
+
+               sids = talloc_array_p(mem_ctx, struct lsa_SidPtr,
+                                     el->num_values);
+
+               if (sids == NULL)
+                       return NT_STATUS_NO_MEMORY;
 
+               for (i=0; i<el->num_values; i++) {
+                       struct ldb_message **msgs2;
+                       const char * const attrs2[2] = { "objectSid", NULL };
+                       ret = samdb_search(a_state->sam_ctx, mem_ctx, NULL,
+                                          &msgs2, attrs2, "dn=%s",
+                                          (char *)el->values[i].data);
+                       if (ret != 1)
+                               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+                       sids[i].sid = samdb_result_dom_sid(mem_ctx, msgs2[0],
+                                                          "objectSid");
+
+                       if (sids[i].sid == NULL)
+                               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
+               r->out.sids->num_sids = el->num_values;
+               r->out.sids->sids = sids;
+       }
+
+       return NT_STATUS_OK;
+}
 
 /* 
   samr_OpenUser 
@@ -1355,10 +2366,10 @@ static NTSTATUS samr_OpenUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
        a_state->sam_ctx = d_state->sam_ctx;
        a_state->access_mask = r->in.access_mask;
        a_state->domain_state = talloc_reference(a_state, d_state);
-       a_state->account_dn = talloc_steal(d_state, msgs[0]->dn);
-       a_state->account_sid = talloc_strdup(d_state, sidstr);
-       a_state->account_name = talloc_strdup(d_state, account_name);
-       if (!a_state->account_name || !a_state->account_sid) {
+       a_state->account_dn = talloc_steal(a_state, msgs[0]->dn);
+       a_state->account_sid = talloc_steal(a_state, sidstr);
+       a_state->account_name = talloc_strdup(a_state, account_name);
+       if (!a_state->account_name) {
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -1440,140 +2451,140 @@ static NTSTATUS samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
        /* fill in the reply */
        switch (r->in.level) {
        case 1:
-               QUERY_STRING(msg, info1.account_name.name,"sAMAccountName");
-               QUERY_STRING(msg, info1.full_name.name,   "displayName");
-               QUERY_UINT  (msg, info1.primary_gid,      "primaryGroupID");
-               QUERY_STRING(msg, info1.description.name, "description");
-               QUERY_STRING(msg, info1.comment.name,     "comment");
+               QUERY_STRING(msg, info1.account_name.string,   "sAMAccountName");
+               QUERY_STRING(msg, info1.full_name.string,      "displayName");
+               QUERY_UINT  (msg, info1.primary_gid,           "primaryGroupID");
+               QUERY_STRING(msg, info1.description.string,    "description");
+               QUERY_STRING(msg, info1.comment.string,        "comment");
                break;
 
        case 2:
-               QUERY_STRING(msg, info2.comment.name,     "comment");
-               QUERY_UINT  (msg, info2.country_code,     "countryCode");
-               QUERY_UINT  (msg, info2.code_page,        "codePage");
+               QUERY_STRING(msg, info2.comment.string,        "comment");
+               QUERY_UINT  (msg, info2.country_code,          "countryCode");
+               QUERY_UINT  (msg, info2.code_page,             "codePage");
                break;
 
        case 3:
-               QUERY_STRING(msg, info3.account_name.name,   "sAMAccountName");
-               QUERY_STRING(msg, info3.full_name.name,      "displayName");
-               QUERY_RID   (msg, info3.rid,                 "objectSid");
-               QUERY_UINT  (msg, info3.primary_gid,         "primaryGroupID");
-               QUERY_STRING(msg, info3.home_directory.name, "homeDirectory");
-               QUERY_STRING(msg, info3.home_drive.name,     "homeDrive");
-               QUERY_STRING(msg, info3.logon_script.name,   "scriptPath");
-               QUERY_STRING(msg, info3.profile_path.name,   "profilePath");
-               QUERY_STRING(msg, info3.workstations.name,   "userWorkstations");
-               QUERY_NTTIME(msg, info3.last_logon,          "lastLogon");
-               QUERY_NTTIME(msg, info3.last_logoff,         "lastLogoff");
-               QUERY_NTTIME(msg, info3.last_password_change,"pwdLastSet");
-               QUERY_APASSC(msg, info3.allow_password_change,"pwdLastSet");
-               QUERY_FPASSC(msg, info3.force_password_change,"pwdLastSet");
-               QUERY_LHOURS(msg, info3.logon_hours,         "logonHours");
-               QUERY_UINT  (msg, info3.bad_password_count,  "badPwdCount");
-               QUERY_UINT  (msg, info3.num_logons,          "logonCount");
-               QUERY_AFLAGS(msg, info3.acct_flags,          "userAccountControl");
+               QUERY_STRING(msg, info3.account_name.string,   "sAMAccountName");
+               QUERY_STRING(msg, info3.full_name.string,      "displayName");
+               QUERY_RID   (msg, info3.rid,                   "objectSid");
+               QUERY_UINT  (msg, info3.primary_gid,           "primaryGroupID");
+               QUERY_STRING(msg, info3.home_directory.string, "homeDirectory");
+               QUERY_STRING(msg, info3.home_drive.string,     "homeDrive");
+               QUERY_STRING(msg, info3.logon_script.string,   "scriptPath");
+               QUERY_STRING(msg, info3.profile_path.string,   "profilePath");
+               QUERY_STRING(msg, info3.workstations.string,   "userWorkstations");
+               QUERY_NTTIME(msg, info3.last_logon,            "lastLogon");
+               QUERY_NTTIME(msg, info3.last_logoff,           "lastLogoff");
+               QUERY_NTTIME(msg, info3.last_password_change,  "pwdLastSet");
+               QUERY_APASSC(msg, info3.allow_password_change, "pwdLastSet");
+               QUERY_FPASSC(msg, info3.force_password_change, "pwdLastSet");
+               QUERY_LHOURS(msg, info3.logon_hours,           "logonHours");
+               QUERY_UINT  (msg, info3.bad_password_count,    "badPwdCount");
+               QUERY_UINT  (msg, info3.logon_count,           "logonCount");
+               QUERY_AFLAGS(msg, info3.acct_flags,            "userAccountControl");
                break;
 
        case 4:
-               QUERY_LHOURS(msg, info4.logon_hours,         "logonHours");
+               QUERY_LHOURS(msg, info4.logon_hours,           "logonHours");
                break;
 
        case 5:
-               QUERY_STRING(msg, info5.account_name.name,   "sAMAccountName");
-               QUERY_STRING(msg, info5.full_name.name,      "displayName");
-               QUERY_RID   (msg, info5.rid,                 "objectSid");
-               QUERY_UINT  (msg, info5.primary_gid,         "primaryGroupID");
-               QUERY_STRING(msg, info5.home_directory.name, "homeDirectory");
-               QUERY_STRING(msg, info5.home_drive.name,     "homeDrive");
-               QUERY_STRING(msg, info5.logon_script.name,   "scriptPath");
-               QUERY_STRING(msg, info5.profile_path.name,   "profilePath");
-               QUERY_STRING(msg, info5.description.name,    "description");
-               QUERY_STRING(msg, info5.workstations.name,   "userWorkstations");
-               QUERY_NTTIME(msg, info5.last_logon,          "lastLogon");
-               QUERY_NTTIME(msg, info5.last_logoff,         "lastLogoff");
-               QUERY_LHOURS(msg, info5.logon_hours,         "logonHours");
-               QUERY_UINT  (msg, info5.bad_password_count,  "badPwdCount");
-               QUERY_UINT  (msg, info5.num_logons,          "logonCount");
-               QUERY_NTTIME(msg, info5.last_password_change,"pwdLastSet");
-               QUERY_NTTIME(msg, info5.acct_expiry,         "accountExpires");
-               QUERY_AFLAGS(msg, info5.acct_flags,          "userAccountControl");
+               QUERY_STRING(msg, info5.account_name.string,   "sAMAccountName");
+               QUERY_STRING(msg, info5.full_name.string,      "displayName");
+               QUERY_RID   (msg, info5.rid,                   "objectSid");
+               QUERY_UINT  (msg, info5.primary_gid,           "primaryGroupID");
+               QUERY_STRING(msg, info5.home_directory.string, "homeDirectory");
+               QUERY_STRING(msg, info5.home_drive.string,     "homeDrive");
+               QUERY_STRING(msg, info5.logon_script.string,   "scriptPath");
+               QUERY_STRING(msg, info5.profile_path.string,   "profilePath");
+               QUERY_STRING(msg, info5.description.string,    "description");
+               QUERY_STRING(msg, info5.workstations.string,   "userWorkstations");
+               QUERY_NTTIME(msg, info5.last_logon,            "lastLogon");
+               QUERY_NTTIME(msg, info5.last_logoff,           "lastLogoff");
+               QUERY_LHOURS(msg, info5.logon_hours,           "logonHours");
+               QUERY_UINT  (msg, info5.bad_password_count,    "badPwdCount");
+               QUERY_UINT  (msg, info5.logon_count,           "logonCount");
+               QUERY_NTTIME(msg, info5.last_password_change,  "pwdLastSet");
+               QUERY_NTTIME(msg, info5.acct_expiry,           "accountExpires");
+               QUERY_AFLAGS(msg, info5.acct_flags,            "userAccountControl");
                break;
 
        case 6:
-               QUERY_STRING(msg, info6.account_name.name,   "sAMAccountName");
-               QUERY_STRING(msg, info6.full_name.name,      "displayName");
+               QUERY_STRING(msg, info6.account_name.string,   "sAMAccountName");
+               QUERY_STRING(msg, info6.full_name.string,      "displayName");
                break;
 
        case 7:
-               QUERY_STRING(msg, info7.account_name.name,   "sAMAccountName");
+               QUERY_STRING(msg, info7.account_name.string,   "sAMAccountName");
                break;
 
        case 8:
-               QUERY_STRING(msg, info8.full_name.name,      "displayName");
+               QUERY_STRING(msg, info8.full_name.string,      "displayName");
                break;
 
        case 9:
-               QUERY_UINT  (msg, info9.primary_gid,         "primaryGroupID");
+               QUERY_UINT  (msg, info9.primary_gid,           "primaryGroupID");
                break;
 
        case 10:
-               QUERY_STRING(msg, info10.home_directory.name, "homeDirectory");
-               QUERY_STRING(msg, info10.home_drive.name,     "homeDrive");
+               QUERY_STRING(msg, info10.home_directory.string,"homeDirectory");
+               QUERY_STRING(msg, info10.home_drive.string,    "homeDrive");
                break;
 
        case 11:
-               QUERY_STRING(msg, info11.logon_script.name,   "scriptPath");
+               QUERY_STRING(msg, info11.logon_script.string,  "scriptPath");
                break;
 
        case 12:
-               QUERY_STRING(msg, info12.profile_path.name,   "profilePath");
+               QUERY_STRING(msg, info12.profile_path.string,  "profilePath");
                break;
 
        case 13:
-               QUERY_STRING(msg, info13.description.name,    "description");
+               QUERY_STRING(msg, info13.description.string,   "description");
                break;
 
        case 14:
-               QUERY_STRING(msg, info14.workstations.name,   "userWorkstations");
+               QUERY_STRING(msg, info14.workstations.string,  "userWorkstations");
                break;
 
        case 16:
-               QUERY_AFLAGS(msg, info16.acct_flags,          "userAccountControl");
+               QUERY_AFLAGS(msg, info16.acct_flags,           "userAccountControl");
                break;
 
        case 17:
-               QUERY_NTTIME(msg, info17.acct_expiry,         "accountExpires");
+               QUERY_NTTIME(msg, info17.acct_expiry,          "accountExpires");
 
        case 20:
-               QUERY_STRING(msg, info20.callback.name,       "userParameters");
+               QUERY_STRING(msg, info20.parameters.string,    "userParameters");
                break;
 
        case 21:
-               QUERY_NTTIME(msg, info21.last_logon,          "lastLogon");
-               QUERY_NTTIME(msg, info21.last_logoff,         "lastLogoff");
-               QUERY_NTTIME(msg, info21.last_password_change,     "pwdLastSet");
-               QUERY_NTTIME(msg, info21.acct_expiry,         "accountExpires");
+               QUERY_NTTIME(msg, info21.last_logon,           "lastLogon");
+               QUERY_NTTIME(msg, info21.last_logoff,          "lastLogoff");
+               QUERY_NTTIME(msg, info21.last_password_change, "pwdLastSet");
+               QUERY_NTTIME(msg, info21.acct_expiry,          "accountExpires");
                QUERY_APASSC(msg, info21.allow_password_change,"pwdLastSet");
                QUERY_FPASSC(msg, info21.force_password_change,"pwdLastSet");
-               QUERY_STRING(msg, info21.account_name.name,   "sAMAccountName");
-               QUERY_STRING(msg, info21.full_name.name,      "displayName");
-               QUERY_STRING(msg, info21.home_directory.name, "homeDirectory");
-               QUERY_STRING(msg, info21.home_drive.name,     "homeDrive");
-               QUERY_STRING(msg, info21.logon_script.name,   "scriptPath");
-               QUERY_STRING(msg, info21.profile_path.name,   "profilePath");
-               QUERY_STRING(msg, info21.description.name,    "description");
-               QUERY_STRING(msg, info21.workstations.name,   "userWorkstations");
-               QUERY_STRING(msg, info21.comment.name,        "comment");
-               QUERY_STRING(msg, info21.callback.name,       "userParameters");
-               QUERY_RID   (msg, info21.rid,                 "objectSid");
-               QUERY_UINT  (msg, info21.primary_gid,         "primaryGroupID");
-               QUERY_AFLAGS(msg, info21.acct_flags,          "userAccountControl");
+               QUERY_STRING(msg, info21.account_name.string,  "sAMAccountName");
+               QUERY_STRING(msg, info21.full_name.string,     "displayName");
+               QUERY_STRING(msg, info21.home_directory.string,"homeDirectory");
+               QUERY_STRING(msg, info21.home_drive.string,    "homeDrive");
+               QUERY_STRING(msg, info21.logon_script.string,  "scriptPath");
+               QUERY_STRING(msg, info21.profile_path.string,  "profilePath");
+               QUERY_STRING(msg, info21.description.string,   "description");
+               QUERY_STRING(msg, info21.workstations.string,  "userWorkstations");
+               QUERY_STRING(msg, info21.comment.string,       "comment");
+               QUERY_STRING(msg, info21.parameters.string,    "userParameters");
+               QUERY_RID   (msg, info21.rid,                  "objectSid");
+               QUERY_UINT  (msg, info21.primary_gid,          "primaryGroupID");
+               QUERY_AFLAGS(msg, info21.acct_flags,           "userAccountControl");
                r->out.info->info21.fields_present = 0x00FFFFFF;
-               QUERY_LHOURS(msg, info21.logon_hours,         "logonHours");
-               QUERY_UINT  (msg, info21.bad_password_count,  "badPwdCount");
-               QUERY_UINT  (msg, info21.num_logons,          "logonCount");
-               QUERY_UINT  (msg, info21.country_code,        "countryCode");
-               QUERY_UINT  (msg, info21.code_page,           "codePage");
+               QUERY_LHOURS(msg, info21.logon_hours,          "logonHours");
+               QUERY_UINT  (msg, info21.bad_password_count,   "badPwdCount");
+               QUERY_UINT  (msg, info21.logon_count,          "logonCount");
+               QUERY_UINT  (msg, info21.country_code,         "countryCode");
+               QUERY_UINT  (msg, info21.code_page,            "codePage");
                break;
                
 
@@ -1610,80 +2621,80 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
 
        switch (r->in.level) {
        case 2:
-               SET_STRING(msg, info2.comment.name,         "comment");
-               SET_UINT  (msg, info2.country_code,         "countryCode");
-               SET_UINT  (msg, info2.code_page,            "codePage");
+               SET_STRING(msg, info2.comment.string,          "comment");
+               SET_UINT  (msg, info2.country_code,            "countryCode");
+               SET_UINT  (msg, info2.code_page,               "codePage");
                break;
 
        case 4:
-               SET_LHOURS(msg, info4.logon_hours,          "logonHours");
+               SET_LHOURS(msg, info4.logon_hours,             "logonHours");
                break;
 
        case 6:
-               SET_STRING(msg, info6.full_name.name,       "displayName");
+               SET_STRING(msg, info6.full_name.string,        "displayName");
                break;
 
        case 8:
-               SET_STRING(msg, info8.full_name.name,       "displayName");
+               SET_STRING(msg, info8.full_name.string,        "displayName");
                break;
 
        case 9:
-               SET_UINT(msg, info9.primary_gid,            "primaryGroupID");
+               SET_UINT(msg, info9.primary_gid,               "primaryGroupID");
                break;
 
        case 10:
-               SET_STRING(msg, info10.home_directory.name, "homeDirectory");
-               SET_STRING(msg, info10.home_drive.name,     "homeDrive");
+               SET_STRING(msg, info10.home_directory.string,  "homeDirectory");
+               SET_STRING(msg, info10.home_drive.string,      "homeDrive");
                break;
 
        case 11:
-               SET_STRING(msg, info11.logon_script.name,   "scriptPath");
+               SET_STRING(msg, info11.logon_script.string,    "scriptPath");
                break;
 
        case 12:
-               SET_STRING(msg, info12.profile_path.name,   "profilePath");
+               SET_STRING(msg, info12.profile_path.string,    "profilePath");
                break;
 
        case 13:
-               SET_STRING(msg, info13.description.name,    "description");
+               SET_STRING(msg, info13.description.string,     "description");
                break;
 
        case 14:
-               SET_STRING(msg, info14.workstations.name,   "userWorkstations");
+               SET_STRING(msg, info14.workstations.string,    "userWorkstations");
                break;
 
        case 16:
-               SET_AFLAGS(msg, info16.acct_flags,          "userAccountControl");
+               SET_AFLAGS(msg, info16.acct_flags,             "userAccountControl");
                break;
 
        case 20:
-               SET_STRING(msg, info20.callback.name,       "userParameters");
+               SET_STRING(msg, info20.parameters.string,      "userParameters");
                break;
 
        case 21:
 #define IFSET(bit) if (bit & r->in.info->info21.fields_present)
                IFSET(SAMR_FIELD_NAME)         
-                       SET_STRING(msg, info21.full_name.name,    "displayName");
+                       SET_STRING(msg, info21.full_name.string,    "displayName");
                IFSET(SAMR_FIELD_DESCRIPTION)  
-                       SET_STRING(msg, info21.description.name,  "description");
+                       SET_STRING(msg, info21.description.string,  "description");
                IFSET(SAMR_FIELD_COMMENT)      
-                       SET_STRING(msg, info21.comment.name,      "comment");
+                       SET_STRING(msg, info21.comment.string,      "comment");
                IFSET(SAMR_FIELD_LOGON_SCRIPT) 
-                       SET_STRING(msg, info21.logon_script.name, "scriptPath");
+                       SET_STRING(msg, info21.logon_script.string, "scriptPath");
                IFSET(SAMR_FIELD_PROFILE_PATH)      
-                       SET_STRING(msg, info21.profile_path.name, "profilePath");
+                       SET_STRING(msg, info21.profile_path.string, "profilePath");
                IFSET(SAMR_FIELD_WORKSTATION)  
-                       SET_STRING(msg, info21.workstations.name, "userWorkstations");
+                       SET_STRING(msg, info21.workstations.string, "userWorkstations");
                IFSET(SAMR_FIELD_LOGON_HOURS)  
-                       SET_LHOURS(msg, info21.logon_hours,       "logonHours");
+                       SET_LHOURS(msg, info21.logon_hours,         "logonHours");
                IFSET(SAMR_FIELD_ACCT_FLAGS)     
-                       SET_AFLAGS(msg, info21.acct_flags,        "userAccountControl");
-               IFSET(SAMR_FIELD_CALLBACK)     
-                       SET_STRING(msg, info21.callback.name,     "userParameters");
+                       SET_AFLAGS(msg, info21.acct_flags,          "userAccountControl");
+               IFSET(SAMR_FIELD_PARAMETERS)     
+                       SET_STRING(msg, info21.parameters.string,   "userParameters");
                IFSET(SAMR_FIELD_COUNTRY_CODE) 
-                       SET_UINT  (msg, info21.country_code,      "countryCode");
+                       SET_UINT  (msg, info21.country_code,        "countryCode");
                IFSET(SAMR_FIELD_CODE_PAGE)    
-                       SET_UINT  (msg, info21.code_page,         "codePage");
+                       SET_UINT  (msg, info21.code_page,           "codePage");
 
 
                /* Any reason the rest of these can't be set? */
@@ -1693,27 +2704,27 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
        case 23:
 #define IFSET(bit) if (bit & r->in.info->info23.info.fields_present)
                IFSET(SAMR_FIELD_NAME)         
-                       SET_STRING(msg, info23.info.full_name.name,    "displayName");
+                       SET_STRING(msg, info23.info.full_name.string,    "displayName");
                IFSET(SAMR_FIELD_DESCRIPTION)  
-                       SET_STRING(msg, info23.info.description.name,  "description");
+                       SET_STRING(msg, info23.info.description.string,  "description");
                IFSET(SAMR_FIELD_COMMENT)      
-                       SET_STRING(msg, info23.info.comment.name,      "comment");
+                       SET_STRING(msg, info23.info.comment.string,      "comment");
                IFSET(SAMR_FIELD_LOGON_SCRIPT) 
-                       SET_STRING(msg, info23.info.logon_script.name, "scriptPath");
+                       SET_STRING(msg, info23.info.logon_script.string, "scriptPath");
                IFSET(SAMR_FIELD_PROFILE_PATH)      
-                       SET_STRING(msg, info23.info.profile_path.name, "profilePath");
+                       SET_STRING(msg, info23.info.profile_path.string, "profilePath");
                IFSET(SAMR_FIELD_WORKSTATION)  
-                       SET_STRING(msg, info23.info.workstations.name, "userWorkstations");
+                       SET_STRING(msg, info23.info.workstations.string, "userWorkstations");
                IFSET(SAMR_FIELD_LOGON_HOURS)  
-                       SET_LHOURS(msg, info23.info.logon_hours,       "logonHours");
+                       SET_LHOURS(msg, info23.info.logon_hours,         "logonHours");
                IFSET(SAMR_FIELD_ACCT_FLAGS)     
-                       SET_AFLAGS(msg, info23.info.acct_flags,        "userAccountControl");
-               IFSET(SAMR_FIELD_CALLBACK)     
-                       SET_STRING(msg, info23.info.callback.name,     "userParameters");
+                       SET_AFLAGS(msg, info23.info.acct_flags,          "userAccountControl");
+               IFSET(SAMR_FIELD_PARAMETERS)     
+                       SET_STRING(msg, info23.info.parameters.string,   "userParameters");
                IFSET(SAMR_FIELD_COUNTRY_CODE) 
-                       SET_UINT  (msg, info23.info.country_code,      "countryCode");
+                       SET_UINT  (msg, info23.info.country_code,        "countryCode");
                IFSET(SAMR_FIELD_CODE_PAGE)    
-                       SET_UINT  (msg, info23.info.code_page,         "codePage");
+                       SET_UINT  (msg, info23.info.code_page,           "codePage");
                IFSET(SAMR_FIELD_PASSWORD) {
                        status = samr_set_password(dce_call,
                                                   a_state->sam_ctx,
@@ -1745,27 +2756,27 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
        case 25:
 #define IFSET(bit) if (bit & r->in.info->info25.info.fields_present)
                IFSET(SAMR_FIELD_NAME)         
-                       SET_STRING(msg, info25.info.full_name.name,    "displayName");
+                       SET_STRING(msg, info25.info.full_name.string,    "displayName");
                IFSET(SAMR_FIELD_DESCRIPTION)  
-                       SET_STRING(msg, info25.info.description.name,  "description");
+                       SET_STRING(msg, info25.info.description.string,  "description");
                IFSET(SAMR_FIELD_COMMENT)      
-                       SET_STRING(msg, info25.info.comment.name,      "comment");
+                       SET_STRING(msg, info25.info.comment.string,      "comment");
                IFSET(SAMR_FIELD_LOGON_SCRIPT) 
-                       SET_STRING(msg, info25.info.logon_script.name, "scriptPath");
+                       SET_STRING(msg, info25.info.logon_script.string, "scriptPath");
                IFSET(SAMR_FIELD_PROFILE_PATH)      
-                       SET_STRING(msg, info25.info.profile_path.name, "profilePath");
+                       SET_STRING(msg, info25.info.profile_path.string, "profilePath");
                IFSET(SAMR_FIELD_WORKSTATION)  
-                       SET_STRING(msg, info25.info.workstations.name, "userWorkstations");
+                       SET_STRING(msg, info25.info.workstations.string, "userWorkstations");
                IFSET(SAMR_FIELD_LOGON_HOURS)  
-                       SET_LHOURS(msg, info25.info.logon_hours,       "logonHours");
+                       SET_LHOURS(msg, info25.info.logon_hours,         "logonHours");
                IFSET(SAMR_FIELD_ACCT_FLAGS)     
-                       SET_AFLAGS(msg, info25.info.acct_flags,        "userAccountControl");
-               IFSET(SAMR_FIELD_CALLBACK)     
-                       SET_STRING(msg, info25.info.callback.name,     "userParameters");
+                       SET_AFLAGS(msg, info25.info.acct_flags,          "userAccountControl");
+               IFSET(SAMR_FIELD_PARAMETERS)     
+                       SET_STRING(msg, info25.info.parameters.string,   "userParameters");
                IFSET(SAMR_FIELD_COUNTRY_CODE) 
-                       SET_UINT  (msg, info25.info.country_code,      "countryCode");
+                       SET_UINT  (msg, info25.info.country_code,        "countryCode");
                IFSET(SAMR_FIELD_CODE_PAGE)    
-                       SET_UINT  (msg, info25.info.code_page,         "codePage");
+                       SET_UINT  (msg, info25.info.code_page,           "codePage");
                IFSET(SAMR_FIELD_PASSWORD) {
                        status = samr_set_password_ex(dce_call,
                                                      a_state->sam_ctx,
@@ -1821,7 +2832,67 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
 static NTSTATUS samr_GetGroupsForUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct samr_GetGroupsForUser *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct dcesrv_handle *h;
+       struct samr_account_state *a_state;
+       struct samr_domain_state *d_state;
+       struct ldb_message **res;
+       struct dom_sid *domain_sid;
+       const char * const attrs[2] = { "objectSid", NULL };
+       struct samr_RidArray *array;
+       int count;
+
+       DCESRV_PULL_HANDLE(h, r->in.user_handle, SAMR_HANDLE_USER);
+
+       a_state = h->data;
+       d_state = a_state->domain_state;
+       domain_sid = dom_sid_parse_talloc(mem_ctx, d_state->domain_sid);
+       if (domain_sid == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       count = samdb_search_domain(a_state->sam_ctx, mem_ctx, NULL, &res,
+                                   attrs, domain_sid,
+                                   "(&(member=%s)(grouptype=%s)(objectclass=group))",
+                                   a_state->account_dn,
+                                   ldb_hexstr(mem_ctx,
+                                              GTYPE_SECURITY_GLOBAL_GROUP));
+       if (count < 0)
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+       array = talloc_p(mem_ctx, struct samr_RidArray);
+       if (array == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       array->count = 0;
+       array->rid = NULL;
+
+       if (count > 0) {
+               int i;
+               array->rid = talloc_array_p(mem_ctx, struct samr_RidType,
+                                           count);
+
+               if (array->rid == NULL)
+                       return NT_STATUS_NO_MEMORY;
+
+               for (i=0; i<count; i++) {
+                       struct dom_sid *group_sid;
+
+                       group_sid = samdb_result_dom_sid(mem_ctx, res[i],
+                                                        "objectSid");
+                       if (group_sid == NULL) {
+                               DEBUG(0, ("Couldn't find objectSid attrib\n"));
+                               continue;
+                       }
+
+                       array->rid[array->count].rid =
+                               group_sid->sub_auths[group_sid->num_auths-1];
+                       array->rid[array->count].type = 7;
+                       array->count += 1;
+               }
+       }
+
+       r->out.rids = array;
+
+       return NT_STATUS_OK;
 }
 
 
@@ -1831,7 +2902,202 @@ static NTSTATUS samr_GetGroupsForUser(struct dcesrv_call_state *dce_call, TALLOC
 static NTSTATUS samr_QueryDisplayInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct samr_QueryDisplayInfo *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct dcesrv_handle *h;
+       struct samr_domain_state *d_state;
+       struct ldb_message **res;
+       int ldb_cnt, count, i;
+       const char * const attrs[4] = { "objectSid", "sAMAccountName",
+                                       "description", NULL };
+       struct dom_sid *domain_sid;
+       struct samr_DispEntryFull *entriesFull = NULL;
+       struct samr_DispEntryAscii *entriesAscii = NULL;
+       struct samr_DispEntryGeneral * entriesGeneral = NULL;
+       const char *filter;
+
+       DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
+
+       d_state = h->data;
+
+       switch (r->in.level) {
+       case 1:
+       case 4:
+               filter = talloc_asprintf(mem_ctx, "(&(objectclass=user)"
+                                        "(sAMAccountType=%s))",
+                                        ldb_hexstr(mem_ctx,
+                                                   ATYPE_NORMAL_ACCOUNT));
+               break;
+       case 2:
+               filter = talloc_asprintf(mem_ctx, "(&(objectclass=user)"
+                                        "(sAMAccountType=%s))",
+                                        ldb_hexstr(mem_ctx,
+                                                   ATYPE_WORKSTATION_TRUST));
+               break;
+       case 3:
+       case 5:
+               filter = talloc_asprintf(mem_ctx, "(&(grouptype=%s)"
+                                        "(objectclass=group))",
+                                        ldb_hexstr(mem_ctx, GTYPE_SECURITY_GLOBAL_GROUP));
+               break;
+       default:
+               return NT_STATUS_INVALID_INFO_CLASS;
+       }
+
+       domain_sid = dom_sid_parse_talloc(mem_ctx, d_state->domain_sid);
+       if (domain_sid == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       /* search for all requested objects in this domain. This could
+          possibly be cached and resumed based on resume_key */
+       ldb_cnt = samdb_search_domain(d_state->sam_ctx, mem_ctx,
+                                     d_state->domain_dn, &res, attrs,
+                                     domain_sid, "%s", filter);
+       if (ldb_cnt == -1) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+       if (ldb_cnt == 0 || r->in.max_entries == 0) {
+               return NT_STATUS_OK;
+       }
+
+       switch (r->in.level) {
+       case 1:
+               entriesGeneral = talloc_array_p(mem_ctx,
+                                               struct samr_DispEntryGeneral,
+                                               ldb_cnt);
+               break;
+       case 2:
+       case 3:
+               entriesFull = talloc_array_p(mem_ctx,
+                                            struct samr_DispEntryFull,
+                                            ldb_cnt);
+               break;
+       case 4:
+       case 5:
+               entriesAscii = talloc_array_p(mem_ctx,
+                                             struct samr_DispEntryAscii,
+                                             ldb_cnt);
+               break;
+       }
+
+       if ((entriesGeneral == NULL) && (entriesFull == NULL) &&
+           (entriesAscii == NULL))
+               return NT_STATUS_NO_MEMORY;
+
+       count = 0;
+
+       for (i=0; i<ldb_cnt; i++) {
+               struct dom_sid *objectsid;
+
+               objectsid = samdb_result_dom_sid(mem_ctx, res[i],
+                                                "objectSid");
+               if (objectsid == NULL)
+                       continue;
+
+               switch(r->in.level) {
+               case 1:
+                       entriesGeneral[count].idx = count;
+                       entriesGeneral[count].rid = 
+                               objectsid->sub_auths[objectsid->num_auths-1];
+                       entriesGeneral[count].acct_flags =
+                               samdb_result_acct_flags(res[i], 
+                                                       "userAccountControl");
+                       entriesGeneral[count].account_name.string =
+                               samdb_result_string(res[i],
+                                                   "sAMAccountName", "");
+                       entriesGeneral[count].full_name.string =
+                               samdb_result_string(res[i], "displayName", "");
+                       entriesGeneral[count].description.string =
+                               samdb_result_string(res[i], "description", "");
+                       break;
+               case 2:
+               case 3:
+                       entriesFull[count].idx = count;
+                       entriesFull[count].rid =
+                               objectsid->sub_auths[objectsid->num_auths-1];
+                       entriesFull[count].acct_flags =
+                               samdb_result_acct_flags(res[i], 
+                                                       "userAccountControl");
+                       if (r->in.level == 3) {
+                               /* We get a "7" here for groups */
+                               entriesFull[count].acct_flags = 7;
+                       }
+                       entriesFull[count].account_name.string =
+                               samdb_result_string(res[i], "sAMAccountName",
+                                                   "");
+                       entriesFull[count].description.string =
+                               samdb_result_string(res[i], "description", "");
+                       break;
+               case 4:
+               case 5:
+                       entriesAscii[count].idx = count;
+                       entriesAscii[count].account_name.string =
+                               samdb_result_string(res[i], "sAMAccountName",
+                                                   "");
+                       break;
+               }
+
+               count += 1;
+       }
+
+       r->out.total_size = count;
+
+       if (r->in.start_idx >= count) {
+               r->out.returned_size = 0;
+               switch(r->in.level) {
+               case 1:
+                       r->out.info.info1.count = r->out.returned_size;
+                       r->out.info.info1.entries = NULL;
+                       break;
+               case 2:
+                       r->out.info.info2.count = r->out.returned_size;
+                       r->out.info.info2.entries = NULL;
+                       break;
+               case 3:
+                       r->out.info.info3.count = r->out.returned_size;
+                       r->out.info.info3.entries = NULL;
+                       break;
+               case 4:
+                       r->out.info.info4.count = r->out.returned_size;
+                       r->out.info.info4.entries = NULL;
+                       break;
+               case 5:
+                       r->out.info.info5.count = r->out.returned_size;
+                       r->out.info.info5.entries = NULL;
+                       break;
+               }
+       } else {
+               r->out.returned_size = MIN(count - r->in.start_idx,
+                                          r->in.max_entries);
+               switch(r->in.level) {
+               case 1:
+                       r->out.info.info1.count = r->out.returned_size;
+                       r->out.info.info1.entries =
+                               &(entriesGeneral[r->in.start_idx]);
+                       break;
+               case 2:
+                       r->out.info.info2.count = r->out.returned_size;
+                       r->out.info.info2.entries =
+                               &(entriesFull[r->in.start_idx]);
+                       break;
+               case 3:
+                       r->out.info.info3.count = r->out.returned_size;
+                       r->out.info.info3.entries =
+                               &(entriesFull[r->in.start_idx]);
+                       break;
+               case 4:
+                       r->out.info.info4.count = r->out.returned_size;
+                       r->out.info.info4.entries =
+                               &(entriesAscii[r->in.start_idx]);
+                       break;
+               case 5:
+                       r->out.info.info5.count = r->out.returned_size;
+                       r->out.info.info5.entries =
+                               &(entriesAscii[r->in.start_idx]);
+                       break;
+               }
+       }
+
+       return (r->out.returned_size < (count - r->in.start_idx)) ?
+               STATUS_MORE_ENTRIES : NT_STATUS_OK;
 }
 
 
@@ -1880,8 +3146,8 @@ static NTSTATUS samr_GetUserPwInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 
        a_state = h->data;
 
-       r->out.info.min_password_len = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "minPwdLength", 
-                                                   "dn=%s", a_state->domain_state->domain_dn);
+       r->out.info.min_password_length = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "minPwdLength", 
+                                                           "dn=%s", a_state->domain_state->domain_dn);
        r->out.info.password_properties = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "pwdProperties", 
                                                            "dn=%s", a_state->account_dn);
        return NT_STATUS_OK;
@@ -1936,7 +3202,22 @@ static NTSTATUS samr_QueryUserInfo2(struct dcesrv_call_state *dce_call, TALLOC_C
 static NTSTATUS samr_QueryDisplayInfo2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct samr_QueryDisplayInfo2 *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct samr_QueryDisplayInfo q;
+       NTSTATUS result;
+
+       q.in.domain_handle = r->in.domain_handle;
+       q.in.level = r->in.level;
+       q.in.start_idx = r->in.start_idx;
+       q.in.max_entries = r->in.max_entries;
+       q.in.buf_size = r->in.buf_size;
+
+       result = samr_QueryDisplayInfo(dce_call, mem_ctx, &q);
+
+       r->out.total_size = q.out.total_size;
+       r->out.returned_size = q.out.returned_size;
+       r->out.info = q.out.info;
+
+       return result;
 }
 
 
@@ -2015,7 +3296,7 @@ static NTSTATUS samr_GetDomPwInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
-       r->out.info.min_password_len         = samdb_result_uint(msgs[0], "minPwdLength", 0);
+       r->out.info.min_password_length = samdb_result_uint(msgs[0], "minPwdLength", 0);
        r->out.info.password_properties = samdb_result_uint(msgs[0], "pwdProperties", 1);
 
        samdb_search_free(sam_ctx, mem_ctx, msgs);