r12427: Move SAMR CreateUser2 to transactions, and re-add support for
[samba.git] / source / rpc_server / samr / dcesrv_samr.c
index 05031bdfcb86ddc2cda8f23d82abdc9dfa711ed6..42be226022a3c7bbea193a135ca754ec2598f3bc 100644 (file)
@@ -4,6 +4,8 @@
    endpoint server for the samr pipe
 
    Copyright (C) Andrew Tridgell 2004
+   Copyright (C) Volker Lendecke 2004
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2004-2005
    
    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 "rpc_server/samr/dcesrv_samr.h"
 #include "system/time.h"
 #include "lib/ldb/include/ldb.h"
+#include "ads.h"
 
 
 /*
-  destroy a general handle. 
+  This is a bad temporary hack until we have at least some kind of schema
+  support
 */
-static void samr_handle_destroy(struct dcesrv_connection *conn, struct dcesrv_handle *h)
+static char *ldb_hexstr(TALLOC_CTX *mem_ctx, uint32_t val)
 {
-       talloc_free(h->data);
+       return talloc_asprintf(mem_ctx, "0x%.8x", val);
 }
 
 /* 
@@ -50,26 +54,26 @@ static NTSTATUS samr_Connect(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem
 
        ZERO_STRUCTP(r->out.connect_handle);
 
-       c_state = talloc_p(dce_call->conn, struct samr_connect_state);
+       c_state = talloc(dce_call->conn, struct samr_connect_state);
        if (!c_state) {
                return NT_STATUS_NO_MEMORY;
        }
 
        /* make sure the sam database is accessible */
-       c_state->sam_ctx = samdb_connect(c_state);
+       c_state->sam_ctx = samdb_connect(c_state, dce_call->conn->auth_state.session_info); 
        if (c_state->sam_ctx == NULL) {
                talloc_free(c_state);
                return NT_STATUS_INVALID_SYSTEM_SERVICE;
        }
 
-       handle = dcesrv_handle_new(dce_call->conn, SAMR_HANDLE_CONNECT);
+
+       handle = dcesrv_handle_new(dce_call->context, SAMR_HANDLE_CONNECT);
        if (!handle) {
                talloc_free(c_state);
                return NT_STATUS_NO_MEMORY;
        }
 
-       handle->data = c_state;
-       handle->destroy = samr_handle_destroy;
+       handle->data = talloc_steal(handle, c_state);
 
        c_state->access_mask = r->in.access_mask;
        *r->out.connect_handle = handle->wire_handle;
@@ -90,10 +94,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 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);
+       talloc_free(h);
 
        ZERO_STRUCTP(r->out.handle);
 
@@ -124,7 +125,7 @@ static NTSTATUS samr_QuerySecurity(struct dcesrv_call_state *dce_call, TALLOC_CT
 
        DCESRV_PULL_HANDLE(h, r->in.handle, DCESRV_HANDLE_ANY);
 
-       sd = talloc_p(mem_ctx, struct sec_desc_buf);
+       sd = talloc(mem_ctx, struct sec_desc_buf);
        if (sd == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -160,32 +161,51 @@ static NTSTATUS samr_LookupDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX
 {
        struct samr_connect_state *c_state;
        struct dcesrv_handle *h;
-       struct dom_sid2 *sid;
-       const char *sidstr;
-               
+       struct dom_sid *sid;
+       const char * const dom_attrs[] = { "objectSid", NULL};
+       const char * const ref_attrs[] = { "ncName", NULL};
+       struct ldb_message **dom_msgs;
+       struct ldb_message **ref_msgs;
+       int ret;
+
        r->out.sid = NULL;
 
        DCESRV_PULL_HANDLE(h, r->in.connect_handle, SAMR_HANDLE_CONNECT);
 
        c_state = h->data;
 
-       if (r->in.domain->string == NULL) {
+       if (r->in.domain_name->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->string);
-       if (sidstr == NULL) {
-               return NT_STATUS_NO_SUCH_DOMAIN;
+       if (strcasecmp(r->in.domain_name->string, "BUILTIN") == 0) {
+               ret = gendb_search(c_state->sam_ctx,
+                                  mem_ctx, NULL, &dom_msgs, dom_attrs,
+                                  "(objectClass=builtinDomain)");
+       } else {
+               ret = gendb_search(c_state->sam_ctx,
+                                  mem_ctx, NULL, &ref_msgs, ref_attrs,
+                                  "(&(&(nETBIOSName=%s)(objectclass=crossRef))(ncName=*))", 
+                                  ldb_binary_encode_string(mem_ctx, r->in.domain_name->string));
+               if (ret != 1) {
+                       return NT_STATUS_NO_SUCH_DOMAIN;
+               }
+               
+               ret = gendb_search_dn(c_state->sam_ctx, mem_ctx, 
+                                     samdb_result_dn(mem_ctx,
+                                                     ref_msgs[0], "ncName", NULL), 
+                                     &dom_msgs, dom_attrs);
        }
 
-       sid = dom_sid_parse_talloc(mem_ctx, sidstr);
+       if (ret != 1) {
+               return NT_STATUS_NO_SUCH_DOMAIN;
+       }
+       
+       sid = samdb_result_dom_sid(mem_ctx, dom_msgs[0],
+                                  "objectSid");
+               
        if (sid == NULL) {
-               DEBUG(0,("samdb: Invalid sid '%s' for domain %s\n",
-                        sidstr, r->in.domain->string));
-               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               return NT_STATUS_NO_SUCH_DOMAIN;
        }
 
        r->out.sid = sid;
@@ -205,8 +225,11 @@ static NTSTATUS samr_EnumDomains(struct dcesrv_call_state *dce_call, TALLOC_CTX
        struct samr_connect_state *c_state;
        struct dcesrv_handle *h;
        struct samr_SamArray *array;
-       const char **domains;
        int count, i, start_i;
+       const char * const dom_attrs[] = { "cn", NULL};
+       const char * const ref_attrs[] = { "nETBIOSName", NULL};
+       struct ldb_message **dom_msgs;
+       struct ldb_message **ref_msgs;
 
        *r->out.resume_handle = 0;
        r->out.sam = NULL;
@@ -216,9 +239,9 @@ static NTSTATUS samr_EnumDomains(struct dcesrv_call_state *dce_call, TALLOC_CTX
 
        c_state = h->data;
 
-       count = samdb_search_string_multiple(c_state->sam_ctx,
-                                            mem_ctx, NULL, &domains, 
-                                            "name", "(objectclass=domain)");
+       count = gendb_search(c_state->sam_ctx,
+                          mem_ctx, NULL, &dom_msgs, dom_attrs,
+                          "(objectClass=domain)");
        if (count == -1) {
                DEBUG(0,("samdb: no domains found in EnumDomains\n"));
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -233,7 +256,7 @@ static NTSTATUS samr_EnumDomains(struct dcesrv_call_state *dce_call, TALLOC_CTX
                return NT_STATUS_OK;
        }
 
-       array = talloc_p(mem_ctx, struct samr_SamArray);
+       array = talloc(mem_ctx, struct samr_SamArray);
        if (array == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -241,14 +264,24 @@ static NTSTATUS samr_EnumDomains(struct dcesrv_call_state *dce_call, TALLOC_CTX
        array->count = 0;
        array->entries = NULL;
 
-       array->entries = talloc_array_p(mem_ctx, struct samr_SamEntry, count - start_i);
+       array->entries = talloc_array(mem_ctx, struct samr_SamEntry, count - start_i);
        if (array->entries == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
        for (i=0;i<count-start_i;i++) {
+               int ret;
                array->entries[i].idx = start_i + i;
-               array->entries[i].name.string = domains[start_i+i];
+               /* try and find the domain */
+               ret = gendb_search(c_state->sam_ctx, mem_ctx, NULL, 
+                                  &ref_msgs, ref_attrs, 
+                                  "(&(objectClass=crossRef)(ncName=%s))", 
+                                  ldb_dn_linearize(mem_ctx, dom_msgs[i]->dn));
+               if (ret == 1) {
+                       array->entries[i].name.string = samdb_result_string(ref_msgs[0], "nETBIOSName", NULL);
+               } else {
+                       array->entries[i].name.string = samdb_result_string(dom_msgs[i], "cn", NULL);
+               }
        }
 
        r->out.sam = array;
@@ -266,11 +299,13 @@ static NTSTATUS samr_OpenDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX *
                                struct samr_OpenDomain *r)
 {
        struct dcesrv_handle *h_conn, *h_domain;
-       const char *sidstr, *domain_name;
+       const char *domain_name;
        struct samr_connect_state *c_state;
        struct samr_domain_state *d_state;
-       const char * const attrs[2] = { "name", NULL};
-       struct ldb_message **msgs;
+       const char * const dom_attrs[] = { "cn", NULL};
+       const char * const ref_attrs[] = { "nETBIOSName", NULL};
+       struct ldb_message **dom_msgs;
+       struct ldb_message **ref_msgs;
        int ret;
 
        ZERO_STRUCTP(r->out.domain_handle);
@@ -283,74 +318,118 @@ static NTSTATUS samr_OpenDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX *
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       sidstr = dom_sid_string(mem_ctx, r->in.sid);
-       if (sidstr == NULL) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       ret = samdb_search(c_state->sam_ctx,
-                          mem_ctx, NULL, &msgs, attrs,
-                          "(&(objectSid=%s)(objectclass=domain))", 
-                          sidstr);
+       ret = gendb_search(c_state->sam_ctx,
+                          mem_ctx, NULL, &dom_msgs, dom_attrs,
+                          "(&(objectSid=%s)(&(objectclass=domain)))",
+                          ldap_encode_ndr_dom_sid(mem_ctx, r->in.sid));
        if (ret != 1) {
-               return NT_STATUS_NO_SUCH_DOMAIN;
-       }
-
-       domain_name = ldb_msg_find_string(msgs[0], "name", NULL);
-       if (domain_name == NULL) {
-               return NT_STATUS_NO_SUCH_DOMAIN;
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       } else {
+               ret = gendb_search(c_state->sam_ctx,
+                                  mem_ctx, NULL, &ref_msgs, ref_attrs,
+                                  "(&(&(nETBIOSName=*)(objectclass=crossRef))(ncName=%s))", 
+                                  ldb_dn_linearize(mem_ctx, dom_msgs[0]->dn));
+               if (ret == 0) {
+                       domain_name = ldb_msg_find_string(dom_msgs[0], "cn", NULL);
+                       if (domain_name == NULL) {
+                               return NT_STATUS_NO_SUCH_DOMAIN;
+                       }
+               } else if (ret == 1) {
+               
+                       domain_name = ldb_msg_find_string(ref_msgs[0], "nETBIOSName", NULL);
+                       if (domain_name == NULL) {
+                               return NT_STATUS_NO_SUCH_DOMAIN;
+                       }
+               } else {
+                       return NT_STATUS_NO_SUCH_DOMAIN;
+               }
        }
 
-       d_state = talloc_p(c_state, struct samr_domain_state);
+       d_state = talloc(c_state, struct samr_domain_state);
        if (!d_state) {
                return NT_STATUS_NO_MEMORY;
        }
 
        d_state->connect_state = talloc_reference(d_state, c_state);
        d_state->sam_ctx = c_state->sam_ctx;
-       d_state->domain_sid = talloc_strdup(d_state, sidstr);
+       d_state->domain_sid = dom_sid_dup(d_state, r->in.sid);
        d_state->domain_name = talloc_strdup(d_state, domain_name);
-       d_state->domain_dn = talloc_strdup(d_state, msgs[0]->dn);
+       d_state->domain_dn = ldb_dn_copy(d_state, dom_msgs[0]->dn);
        if (!d_state->domain_sid || !d_state->domain_name || !d_state->domain_dn) {
                talloc_free(d_state);
                return NT_STATUS_NO_MEMORY;             
        }
        d_state->access_mask = r->in.access_mask;
 
-       h_domain = dcesrv_handle_new(dce_call->conn, SAMR_HANDLE_DOMAIN);
+       h_domain = dcesrv_handle_new(dce_call->context, SAMR_HANDLE_DOMAIN);
        if (!h_domain) {
                talloc_free(d_state);
                return NT_STATUS_NO_MEMORY;
        }
        
-       h_domain->data = d_state;
-       h_domain->destroy = samr_handle_destroy;
+       h_domain->data = talloc_steal(h_domain, d_state);
+
        *r->out.domain_handle = h_domain->wire_handle;
 
        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 = gendb_search_dn(state->sam_ctx, mem_ctx,
+                             state->domain_dn , &res, attrs);
+       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
 */
 static NTSTATUS samr_info_DomInfo2(struct samr_domain_state *state, TALLOC_CTX *mem_ctx,
                                   struct samr_DomInfo2 *info)
 {
-       const char * const attrs[] = { "comment", "name", NULL };
+       const char * const dom_attrs[] = { "comment", NULL };
        int ret;
-       struct ldb_message **res;
-
-       ret = samdb_search(state->sam_ctx, mem_ctx, NULL, &res, attrs, 
-                          "dn=%s", state->domain_dn);
+       struct ldb_message **dom_msgs;
+       const char *domain_name;
+       
+       ret = gendb_search_dn(state->sam_ctx, mem_ctx,
+                             state->domain_dn, &dom_msgs, dom_attrs);
        if (ret != 1) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
+       domain_name = state->domain_name;
        /* where is this supposed to come from? is it settable? */
        info->force_logoff_time = 0x8000000000000000LL;
 
-       info->comment.string = samdb_result_string(res[0], "comment", NULL);
-       info->domain.string  = samdb_result_string(res[0], "name", NULL);
+       info->comment.string = samdb_result_string(dom_msgs[0], "comment", NULL);
+       info->domain_name.string  = domain_name;
 
        info->primary.string = lp_netbios_name();
        info->sequence_num = 0;
@@ -366,6 +445,19 @@ static NTSTATUS samr_info_DomInfo2(struct samr_domain_state *state, TALLOC_CTX *
        return NT_STATUS_OK;
 }
 
+/*
+  return DomInfo3
+*/
+static NTSTATUS samr_info_DomInfo3(struct samr_domain_state *state,
+                                  TALLOC_CTX *mem_ctx,
+                                  struct samr_DomInfo3 *info)
+{
+       /* where is this supposed to come from? is it settable? */
+       info->force_logoff_time = 0x8000000000000000LL;
+
+       return NT_STATUS_OK;
+}
+
 /* 
   samr_QueryDomainInfo 
 */
@@ -381,7 +473,7 @@ static NTSTATUS samr_QueryDomainInfo(struct dcesrv_call_state *dce_call, TALLOC_
 
        d_state = h->data;
 
-       r->out.info = talloc_p(mem_ctx, union samr_DomainInfo);
+       r->out.info = talloc(mem_ctx, union samr_DomainInfo);
        if (!r->out.info) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -389,8 +481,14 @@ 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);
+       case 3:
+               return samr_info_DomInfo3(d_state, mem_ctx,
+                                         &r->out.info->info3);
        }
 
        return NT_STATUS_INVALID_INFO_CLASS;
@@ -416,14 +514,11 @@ static NTSTATUS samr_CreateDomainGroup(struct dcesrv_call_state *dce_call, TALLO
        struct samr_account_state *a_state;
        struct dcesrv_handle *h;
        const char *name;
-       struct ldb_message msg;
-       uint32_t rid;
-       const char *groupname, *sidstr, *guidstr;
-       struct GUID guid;
-       time_t now = time(NULL);
+       struct ldb_message *msg;
+       struct dom_sid *sid;
+       const char *groupname;
        struct dcesrv_handle *g_handle;
        int ret;
-       NTSTATUS status;
 
        ZERO_STRUCTP(r->out.group_handle);
        *r->out.rid = 0;
@@ -442,101 +537,169 @@ static NTSTATUS samr_CreateDomainGroup(struct dcesrv_call_state *dce_call, TALLO
        name = samdb_search_string(d_state->sam_ctx, mem_ctx, NULL, 
                                   "sAMAccountName",
                                   "(&(sAMAccountName=%s)(objectclass=group))",
-                                  groupname);
+                                  ldb_binary_encode_string(mem_ctx, groupname));
        if (name != NULL) {
                return NT_STATUS_GROUP_EXISTS;
        }
 
-       ZERO_STRUCT(msg);
-
-       /* pull in all the template attributes */
-       ret = samdb_copy_template(d_state->sam_ctx, mem_ctx, &msg, 
-                                 "(&(name=TemplateGroup)(objectclass=groupTemplate))");
-       if (ret != 0) {
-               DEBUG(0,("Failed to load TemplateGroup 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) {
+       msg = ldb_msg_new(mem_ctx);
+       if (msg == NULL) {
                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) {
+       msg->dn = ldb_dn_string_compose(mem_ctx, d_state->domain_dn,
+                                       "CN=%s, CN=Users", groupname);
+       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_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);
+       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");
                             
        /* create the group */
-       ret = samdb_add(d_state->sam_ctx, mem_ctx, &msg);
+       ret = samdb_add(d_state->sam_ctx, mem_ctx, msg);
        if (ret != 0) {
-               DEBUG(0,("Failed to create group record %s\n", msg.dn));
+               DEBUG(0,("Failed to create group record %s\n",
+                        ldb_dn_linearize(mem_ctx, msg->dn)));
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
-       a_state = talloc_p(d_state, struct samr_account_state);
+       a_state = talloc(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(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);
+
+       /* retrieve the sid for the group just created */
+       sid = samdb_search_dom_sid(d_state->sam_ctx, a_state,
+                                  msg->dn, "objectSid", NULL);
+       if (sid == NULL) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       a_state->account_name = talloc_strdup(a_state, groupname);
+       if (!a_state->account_name) {
                return NT_STATUS_NO_MEMORY;
        }
 
        /* create the policy handle */
-       g_handle = dcesrv_handle_new(dce_call->conn, SAMR_HANDLE_GROUP);
+       g_handle = dcesrv_handle_new(dce_call->context, SAMR_HANDLE_GROUP);
        if (!g_handle) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       g_handle->data = a_state;
-       g_handle->destroy = samr_handle_destroy;
+       g_handle->data = talloc_steal(g_handle, a_state);
 
        *r->out.group_handle = g_handle->wire_handle;
-       *r->out.rid = rid;      
+       *r->out.rid = sid->sub_auths[sid->num_auths-1];
 
        return NT_STATUS_OK;
 }
 
 
+/*
+  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 };
+
+       *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;
+
+       /* 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,
+                                     d_state->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(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(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;
 }
 
 
@@ -552,15 +715,24 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
        struct samr_account_state *a_state;
        struct dcesrv_handle *h;
        const char *name;
-       struct ldb_message msg;
-       uint32_t rid;
-       const char *account_name, *sidstr, *guidstr;
-       struct GUID guid;
-       time_t now = time(NULL);
+       struct ldb_message *msg;
+       struct dom_sid *sid;
+       const char *account_name;
        struct dcesrv_handle *u_handle;
        int ret;
-       NTSTATUS status;
-       const char *container, *additional_class=NULL;
+       const char *container, *obj_class=NULL;
+       char *cn_name;
+       int cn_name_len;
+
+       const char *attrs[] = {
+               "objectSid", 
+               "userAccountControl",
+               NULL
+       };
+
+       uint32_t user_account_control;
+
+       struct ldb_message **msgs;
 
        ZERO_STRUCTP(r->out.user_handle);
        *r->out.access_granted = 0;
@@ -576,143 +748,162 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
                return NT_STATUS_INVALID_PARAMETER;
        }
 
+       ret = ldb_transaction_start(d_state->sam_ctx);
+       if (ret != 0) {
+               DEBUG(0,("Failed to start a transaction for user creation\n"));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
        /* check if the user already exists */
        name = samdb_search_string(d_state->sam_ctx, mem_ctx, NULL, 
                                   "sAMAccountName", 
-                                  "(&(sAMAccountName=%s)(objectclass=user))", account_name);
+                                  "(&(sAMAccountName=%s)(objectclass=user))", 
+                                  ldb_binary_encode_string(mem_ctx, account_name));
        if (name != NULL) {
+               ldb_transaction_cancel(d_state->sam_ctx);
                return NT_STATUS_USER_EXISTS;
        }
 
-       ZERO_STRUCT(msg);
+       msg = ldb_msg_new(mem_ctx);
+       if (msg == NULL) {
+               ldb_transaction_cancel(d_state->sam_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       cn_name   = talloc_strdup(mem_ctx, account_name);
+       NT_STATUS_HAVE_NO_MEMORY(cn_name);
+       cn_name_len = strlen(cn_name);
 
        /* This must be one of these values *only* */
        if (r->in.acct_flags == ACB_NORMAL) {
-               /* pull in all the template attributes */
-               ret = samdb_copy_template(d_state->sam_ctx, mem_ctx, &msg, 
-                                         "(&(name=TemplateUser)(objectclass=userTemplate))");
-               if (ret != 0) {
-                       DEBUG(0,("Failed to load TemplateUser from samdb\n"));
-                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
-               }
-
                container = "Users";
+               obj_class = "user";
 
        } else if (r->in.acct_flags == ACB_WSTRUST) {
-               /* pull in all the template attributes */
-               ret = samdb_copy_template(d_state->sam_ctx, mem_ctx, &msg, 
-                                         "(&(name=TemplateMemberServer)(objectclass=userTemplate))");
-               if (ret != 0) {
-                       DEBUG(0,("Failed to load TemplateMemberServer from samdb\n"));
-                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               if (cn_name[cn_name_len - 1] != '$') {
+                       return NT_STATUS_FOOBAR;
                }
-
+               cn_name[cn_name_len - 1] = '\0';
                container = "Computers";
-               additional_class = "computer";
+               obj_class = "computer";
 
        } else if (r->in.acct_flags == ACB_SVRTRUST) {
-               /* pull in all the template attributes */
-               ret = samdb_copy_template(d_state->sam_ctx, mem_ctx, &msg, 
-                                         "(&(name=TemplateDomainController)(objectclass=userTemplate))");
-               if (ret != 0) {
-                       DEBUG(0,("Failed to load TemplateDomainController from samdb\n"));
-                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               if (cn_name[cn_name_len - 1] != '$') {
+                       return NT_STATUS_FOOBAR;                
                }
-
-               container = "DomainControllers";
-               additional_class = "computer";
+               cn_name[cn_name_len - 1] = '\0';
+               container = "Domain Controllers";
+               obj_class = "computer";
 
        } else if (r->in.acct_flags == ACB_DOMTRUST) {
-               /* pull in all the template attributes */
-               ret = samdb_copy_template(d_state->sam_ctx, mem_ctx, &msg, 
-                                         "(&(name=TemplateTrustingDomain)(objectclass=userTemplate))");
-               if (ret != 0) {
-                       DEBUG(0,("Failed to load TemplateTrustingDomain from samdb\n"));
-                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
-               }
-
-               container = "ForeignDomains";  /* FIXME: Is this correct?*/
-               additional_class = "computer";
+               container = "Users";
+               obj_class = "user";
 
        } else {
+               ldb_transaction_cancel(d_state->sam_ctx);
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       /* 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;
+       /* add core elements to the ldb_message for the user */
+       msg->dn = ldb_dn_build_child(mem_ctx, "CN", cn_name, ldb_dn_build_child(mem_ctx, "CN", container, d_state->domain_dn));
+       if (!msg->dn) {
+               ldb_transaction_cancel(d_state->sam_ctx);
+               return NT_STATUS_NO_MEMORY;             
+       }
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, msg, "sAMAccountName", account_name);
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, msg, "objectClass", obj_class);
+       
+       /* Start a transaction, so we can query and do a subsequent atomic modify */
+       
+       /* create the user */
+       ret = samdb_add(d_state->sam_ctx, mem_ctx, msg);
+       if (ret != 0) {
+               ldb_transaction_cancel(d_state->sam_ctx);
+               DEBUG(0,("Failed to create user record %s\n",
+                        ldb_dn_linearize(mem_ctx, msg->dn)));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
-       /* and the users SID */
-       sidstr = talloc_asprintf(mem_ctx, "%s-%u", d_state->domain_sid, rid);
-       if (!sidstr) {
+       a_state = talloc(d_state, struct samr_account_state);
+       if (!a_state) {
+               ldb_transaction_cancel(d_state->sam_ctx);
                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);
+
+       /* retrieve the sid and account control bits for the user just created */
+       ret = gendb_search_dn(d_state->sam_ctx, a_state,
+                             msg->dn, &msgs, attrs);
+
+       if (ret != 1) {
+               ldb_transaction_cancel(d_state->sam_ctx);
+               DEBUG(0,("Apparently we failed to create an account record, as %s now doesn't exist\n",
+                        ldb_dn_linearize(mem_ctx, msg->dn)));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+       sid = samdb_result_dom_sid(mem_ctx, msgs[0], "objectSid");
+       if (sid == NULL) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
 
-       /* a new GUID */
-       guid = GUID_random();
-       guidstr = GUID_string(mem_ctx, &guid);
-       if (!guidstr) {
+       user_account_control = samdb_result_uint(msgs[0], "userAccountControl", 0);
+       user_account_control = (user_account_control & ~(UF_NORMAL_ACCOUNT|UF_INTERDOMAIN_TRUST_ACCOUNT|UF_WORKSTATION_TRUST_ACCOUNT|UF_SERVER_TRUST_ACCOUNT));
+       user_account_control |= samdb_acb2uf(r->in.acct_flags);
+
+       talloc_free(msg);
+       msg = ldb_msg_new(mem_ctx);
+       if (msg == NULL) {
+               ldb_transaction_cancel(d_state->sam_ctx);
                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) {
-               return NT_STATUS_NO_MEMORY;             
+       msg->dn = a_state->account_dn;
+
+       if (samdb_msg_add_uint(a_state->sam_ctx, mem_ctx, msg, 
+                              "userAccountControl", 
+                              user_account_control) != 0) { 
+               ldb_transaction_cancel(d_state->sam_ctx);
+               return NT_STATUS_NO_MEMORY; 
        }
-       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "name", account_name);
-       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "cn", account_name);
-       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "sAMAccountName", account_name);
-       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectClass", "user");
-       if (additional_class) {
-               samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectClass", additional_class);
+
+       /* modify the samdb record */
+       ret = samdb_replace(a_state->sam_ctx, mem_ctx, msg);
+       if (ret != 0) {
+               DEBUG(0,("Failed to modify account record %s to set userAccountControl\n",
+                        ldb_dn_linearize(mem_ctx, msg->dn)));
+               ldb_transaction_cancel(d_state->sam_ctx);
+
+               /* we really need samdb.c to return NTSTATUS */
+               return NT_STATUS_UNSUCCESSFUL;
        }
-       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 user */
-       ret = samdb_add(d_state->sam_ctx, mem_ctx, &msg);
+       ldb_transaction_commit(d_state->sam_ctx);
        if (ret != 0) {
-               DEBUG(0,("Failed to create user record %s\n", msg.dn));
+               DEBUG(0,("Failed to commit transaction to add and modify account record %s\n",
+                        ldb_dn_linearize(mem_ctx, 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(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_name = talloc_steal(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);
+       u_handle = dcesrv_handle_new(dce_call->context, SAMR_HANDLE_USER);
        if (!u_handle) {
-               talloc_free(a_state);
                return NT_STATUS_NO_MEMORY;
        }
 
-       u_handle->data = a_state;
-       u_handle->destroy = samr_handle_destroy;
-
-       /* the domain state is in use one more time */
-       
+       u_handle->data = talloc_steal(u_handle, a_state);
 
        *r->out.user_handle = u_handle->wire_handle;
        *r->out.access_granted = 0xf07ff; /* TODO: fix access mask calculations */
-       *r->out.rid = rid;      
+
+       *r->out.rid = sid->sub_auths[sid->num_auths-1];
 
        return NT_STATUS_OK;
 }
@@ -740,14 +931,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 
 */
@@ -771,7 +954,7 @@ static NTSTATUS samr_EnumDomainUsers(struct dcesrv_call_state *dce_call, TALLOC_
        
        /* search for all users in this domain. This could possibly be cached and 
           resumed based on resume_key */
-       count = samdb_search(d_state->sam_ctx, mem_ctx, d_state->domain_dn, &res, attrs, 
+       count = gendb_search(d_state->sam_ctx, mem_ctx, d_state->domain_dn, &res, attrs, 
                             "objectclass=user");
        if (count == -1) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -781,7 +964,7 @@ static NTSTATUS samr_EnumDomainUsers(struct dcesrv_call_state *dce_call, TALLOC_
        }
 
        /* convert to SamEntry format */
-       entries = talloc_array_p(mem_ctx, struct samr_SamEntry, count);
+       entries = talloc_array(mem_ctx, struct samr_SamEntry, count);
        if (!entries) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -809,7 +992,7 @@ static NTSTATUS samr_EnumDomainUsers(struct dcesrv_call_state *dce_call, TALLOC_
        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);
+       r->out.sam = talloc(mem_ctx, struct samr_SamArray);
        if (!r->out.sam) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -832,34 +1015,277 @@ 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 *alias_name, *name;
+       struct ldb_message *msg;
+       struct dom_sid *sid;
+       struct dcesrv_handle *a_handle;
+       int ret;
 
+       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);
-}
+       alias_name = r->in.alias_name->string;
 
+       if (alias_name == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-/* 
-  samr_LookupNames 
-*/
-static NTSTATUS samr_LookupNames(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+       /* Check if alias already exists */
+       name = samdb_search_string(d_state->sam_ctx, mem_ctx, NULL,
+                                  "sAMAccountName",
+                                  "(sAMAccountName=%s)(objectclass=group))",
+                                  ldb_binary_encode_string(mem_ctx, alias_name));
+
+       if (name != NULL) {
+               return NT_STATUS_ALIAS_EXISTS;
+       }
+
+       msg = ldb_msg_new(mem_ctx);
+       if (msg == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* add core elements to the ldb_message for the alias */
+       msg->dn = ldb_dn_string_compose(mem_ctx, d_state->domain_dn,
+                                       "CN=%s, CN=Users", alias_name);
+       if (!msg->dn) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, msg, "sAMAccountName", alias_name);
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, msg, "objectClass", "group");
+       samdb_msg_add_string(d_state->sam_ctx, mem_ctx, msg, "groupType", "0x80000004");
+
+       /* 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",
+                        ldb_dn_linearize(mem_ctx, msg->dn)));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       a_state = talloc(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);
+
+       /* retrieve the sid for the alias just created */
+       sid = samdb_search_dom_sid(d_state->sam_ctx, a_state,
+                                  msg->dn, "objectSid", NULL);
+
+       a_state->account_name = talloc_strdup(a_state, alias_name);
+       if (!a_state->account_name) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* create the policy handle */
+       a_handle = dcesrv_handle_new(dce_call->context, SAMR_HANDLE_ALIAS);
+       if (a_handle == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       a_handle->data = talloc_steal(a_handle, a_state);
+
+       *r->out.alias_handle = a_handle->wire_handle;
+
+       *r->out.rid = sid->sub_auths[sid->num_auths-1];
+
+       return NT_STATUS_OK;
+}
+
+
+/* 
+  samr_EnumDomainAliases 
+*/
+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;
+       struct ldb_message **res;
+       int ldb_cnt, count, i, first;
+       struct samr_SamEntry *entries;
+       const char * const attrs[3] = { "objectSid", "sAMAccountName", NULL };
+
+       *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;
+
+       /* 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, 
+                                     d_state->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;
+       }
+
+       /* convert to SamEntry format */
+       entries = talloc_array(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 *alias_sid;
+
+               alias_sid = samdb_result_dom_sid(mem_ctx, res[i],
+                                                "objectSid");
+
+               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(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;
+       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 *memberdn;
+
+                       memberdn = 
+                               samdb_search_string(d_state->sam_ctx,
+                                                   mem_ctx, NULL, "distinguishedName",
+                                                   "(objectSid=%s)",
+                                                   ldap_encode_ndr_dom_sid(mem_ctx, 
+                                                                           r->in.sids->sids[i].sid));
+
+                       if (memberdn == NULL)
+                               continue;
+
+                       filter = talloc_asprintf(mem_ctx, "%s(member=%s)",
+                                                filter, memberdn);
+                       if (filter == NULL)
+                               return NT_STATUS_NO_MEMORY;
+               }
+
+               count = samdb_search_domain(d_state->sam_ctx, mem_ctx,
+                                           d_state->domain_dn, &res, attrs,
+                                           d_state->domain_sid, "%s))", filter);
+               if (count < 0)
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       r->out.rids->count = 0;
+       r->out.rids->ids = talloc_array(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;
@@ -880,8 +1306,8 @@ static NTSTATUS samr_LookupNames(struct dcesrv_call_state *dce_call, TALLOC_CTX
                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);
+       r->out.rids.ids = talloc_array(mem_ctx, uint32_t, r->in.num_names);
+       r->out.types.ids = talloc_array(mem_ctx, uint32_t, r->in.num_names);
        if (!r->out.rids.ids || !r->out.types.ids) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -890,32 +1316,26 @@ static NTSTATUS samr_LookupNames(struct dcesrv_call_state *dce_call, TALLOC_CTX
 
        for (i=0;i<r->in.num_names;i++) {
                struct ldb_message **res;
-               struct dom_sid2 *sid;
-               const char *sidstr;
+               struct dom_sid *sid;
                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);
+               count = gendb_search(d_state->sam_ctx, mem_ctx, d_state->domain_dn, &res, attrs, 
+                                    "sAMAccountName=%s", 
+                                    ldb_binary_encode_string(mem_ctx, 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;
-               }
-               
-               sid = dom_sid_parse_talloc(mem_ctx, sidstr);
+               sid = samdb_result_dom_sid(mem_ctx, res[0], "objectSid");
                if (sid == NULL) {
                        status = STATUS_SOME_UNMAPPED;
                        continue;
                }
-
+               
                atype = samdb_result_uint(res[0], "sAMAccountType", 0);
                if (atype == 0) {
                        status = STATUS_SOME_UNMAPPED;
@@ -944,7 +1364,82 @@ 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, total;
+       NTSTATUS status = NT_STATUS_OK;
+       struct lsa_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(mem_ctx, struct lsa_String, r->in.num_rids);
+       ids = talloc_array(mem_ctx, uint32_t, r->in.num_rids);
+
+       if ((names == NULL) || (ids == NULL))
+               return NT_STATUS_NO_MEMORY;
+
+       total = 0;
+
+       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;
+               struct dom_sid *sid;
+
+               ids[i] = SID_NAME_UNKNOWN;
+
+               sid = dom_sid_add_rid(mem_ctx, d_state->domain_sid, r->in.rids[i]);
+               if (sid == NULL) {
+                       names[i].string = NULL;
+                       status = STATUS_SOME_UNMAPPED;
+                       continue;
+               }
+               
+               count = gendb_search(d_state->sam_ctx, mem_ctx,
+                                    d_state->domain_dn, &res, attrs,
+                                    "(objectSid=%s)", 
+                                    ldap_encode_ndr_dom_sid(mem_ctx, sid));
+               if (count != 1) {
+                       names[i].string = NULL;
+                       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;
 }
 
 
@@ -957,7 +1452,8 @@ static NTSTATUS samr_OpenGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
        struct samr_domain_state *d_state;
        struct samr_account_state *a_state;
        struct dcesrv_handle *h;
-       const char *groupname, *sidstr;
+       const char *groupname;
+       struct dom_sid *sid;
        struct ldb_message **msgs;
        struct dcesrv_handle *g_handle;
        const char * const attrs[2] = { "sAMAccountName", NULL };
@@ -970,31 +1466,36 @@ static NTSTATUS samr_OpenGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
        d_state = h->data;
 
        /* form the group SID */
-       sidstr = talloc_asprintf(mem_ctx, "%s-%u", d_state->domain_sid, r->in.rid);
-       if (!sidstr) {
+       sid = dom_sid_add_rid(mem_ctx, d_state->domain_sid, r->in.rid);
+       if (!sid) {
                return NT_STATUS_NO_MEMORY;
        }
 
        /* search for the group record */
-       ret = samdb_search(d_state->sam_ctx,
+       ret = gendb_search(d_state->sam_ctx,
                           mem_ctx, d_state->domain_dn, &msgs, attrs,
-                          "(&(objectSid=%s)(objectclass=group))", 
-                          sidstr);
+                          "(&(objectSid=%s)(objectclass=group)"
+                          "(grouptype=%s))",
+                          ldap_encode_ndr_dom_sid(mem_ctx, sid),
+                          ldb_hexstr(mem_ctx,
+                                     GTYPE_SECURITY_GLOBAL_GROUP));
        if (ret == 0) {
                return NT_STATUS_NO_SUCH_GROUP;
        }
        if (ret != 1) {
-               DEBUG(0,("Found %d records matching sid %s\n", ret, sidstr));
+               DEBUG(0,("Found %d records matching sid %s\n", 
+                        ret, dom_sid_string(mem_ctx, sid)));
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
        groupname = samdb_result_string(msgs[0], "sAMAccountName", NULL);
        if (groupname == NULL) {
-               DEBUG(0,("sAMAccountName field missing for sid %s\n", sidstr));
+               DEBUG(0,("sAMAccountName field missing for sid %s\n", 
+                        dom_sid_string(mem_ctx, sid)));
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
-       a_state = talloc_p(d_state, struct samr_account_state);
+       a_state = talloc(d_state, struct samr_account_state);
        if (!a_state) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1002,20 +1503,19 @@ 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, sid);
        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;
        }
 
        /* create the policy handle */
-       g_handle = dcesrv_handle_new(dce_call->conn, SAMR_HANDLE_GROUP);
+       g_handle = dcesrv_handle_new(dce_call->context, SAMR_HANDLE_GROUP);
        if (!g_handle) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       g_handle->data = a_state;
-       g_handle->destroy = samr_handle_destroy;
+       g_handle->data = talloc_steal(g_handle, a_state);
 
        *r->out.group_handle = g_handle->wire_handle;
 
@@ -1091,15 +1591,15 @@ static NTSTATUS samr_QueryGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_C
        a_state = h->data;
 
        /* pull all the group attributes */
-       ret = samdb_search(a_state->sam_ctx, mem_ctx, NULL, &res, attrs,
-                          "dn=%s", a_state->account_dn);
+       ret = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+                             a_state->account_dn, &res, attrs);
        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_GroupInfo);
+       r->out.info = talloc(mem_ctx, union samr_GroupInfo);
        if (r->out.info == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1107,19 +1607,19 @@ static NTSTATUS samr_QueryGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_C
 
        /* Fill in the level */
        switch (r->in.level) {
-       case GroupInfoAll:
+       case GROUPINFOALL:
                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.string, "description");
                break;
-       case GroupInfoName:
+       case GROUPINFONAME:
                QUERY_STRING(msg, name.string,            "sAMAccountName");
                break;
-       case GroupInfoX:
+       case GROUPINFOX:
                r->out.info->unknown.unknown = 7;
                break;
-       case GroupInfoDescription:
+       case GROUPINFODESCRIPTION:
                QUERY_STRING(msg, description.string, "description");
                break;
        default:
@@ -1135,33 +1635,37 @@ static NTSTATUS samr_QueryGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_C
   samr_SetGroupInfo 
 */
 static NTSTATUS samr_SetGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_SetGroupInfo *r)
+                                 struct samr_SetGroupInfo *r)
 {
        struct dcesrv_handle *h;
        struct samr_account_state *a_state;
-       struct ldb_message mod, *msg = &mod;
+       struct ldb_message *msg;
        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) {
+       msg = ldb_msg_new(mem_ctx);
+       if (msg == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }       
+
+       msg->dn = ldb_dn_copy(mem_ctx, a_state->account_dn);
+       if (!msg->dn) {
                return NT_STATUS_NO_MEMORY;
        }
 
        switch (r->in.level) {
-       case GroupInfoDescription:
+       case GROUPINFODESCRIPTION:
                SET_STRING(msg, description.string,         "description");
                break;
-       case GroupInfoName:
+       case GROUPINFONAME:
                /* On W2k3 this does not change the name, it changes the
                 * sAMAccountName attribute */
                SET_STRING(msg, name.string,                "sAMAccountName");
                break;
-       case GroupInfoX:
+       case GROUPINFOX:
                /* This does not do anything obviously visible in W2k3 LDAP */
                break;
        default:
@@ -1169,7 +1673,7 @@ static NTSTATUS samr_SetGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
        }
 
        /* modify the samdb record */
-       ret = samdb_replace(a_state->sam_ctx, mem_ctx, &mod);
+       ret = samdb_replace(a_state->sam_ctx, mem_ctx, msg);
        if (ret != 0) {
                /* we really need samdb.c to return NTSTATUS */
                return NT_STATUS_UNSUCCESSFUL;
@@ -1184,24 +1688,432 @@ static NTSTATUS samr_SetGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
 */
 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;
+       struct dom_sid *membersid;
+       const char *memberdn;
+       struct ldb_message **msgs;
+       const char * const attrs[2] = { "distinguishedName", NULL };
+       int ret;
+
+       DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
+
+       a_state = h->data;
+       d_state = a_state->domain_state;
+
+       membersid = dom_sid_add_rid(mem_ctx, d_state->domain_sid, r->in.rid);
+       if (membersid == 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 = gendb_search(d_state->sam_ctx, mem_ctx, d_state->domain_dn,
+                          &msgs, attrs, "(&(objectSid=%s)(objectclass=user))",
+                          ldap_encode_ndr_dom_sid(mem_ctx, membersid));
+
+       if (ret == 0)
+               return NT_STATUS_NO_SUCH_USER;
+
+       if (ret > 1)
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+       memberdn = samdb_result_string(msgs[0], "distinguishedName", NULL);
+
+       if (memberdn == NULL)
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+       mod = ldb_msg_new(mem_ctx);
+       if (mod == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       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;
+       struct dom_sid *membersid;
+       const char *memberdn;
+       struct ldb_message **msgs;
+       const char * const attrs[2] = { "distinguishedName", NULL };
+       int ret;
+
+       DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
+
+       a_state = h->data;
+       d_state = a_state->domain_state;
+
+       membersid = dom_sid_add_rid(mem_ctx, d_state->domain_sid, r->in.rid);
+       if (membersid == 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 = gendb_search(d_state->sam_ctx, mem_ctx, d_state->domain_dn,
+                          &msgs, attrs, "(&(objectSid=%s)(objectclass=user))",
+                          ldap_encode_ndr_dom_sid(mem_ctx, membersid));
+
+       if (ret == 0)
+               return NT_STATUS_NO_SUCH_USER;
+
+       if (ret > 1)
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+       memberdn = samdb_result_string(msgs[0], "distinguishedName", NULL);
+
+       if (memberdn == NULL)
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+       mod = ldb_msg_new(mem_ctx);
+       if (mod == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       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_RidTypeArray *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 = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+                             a_state->account_dn, &res, attrs);
+
+       if (ret != 1) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       array = talloc(mem_ctx, struct samr_RidTypeArray);
+
+       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(mem_ctx, uint32_t,
+                                            el->num_values);
+               if (array->rids == NULL)
+                       return NT_STATUS_NO_MEMORY;
+
+               array->types = talloc_array(mem_ctx, uint32_t,
+                                           el->num_values);
+               if (array->types == 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 = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+                                          ldb_dn_explode(mem_ctx, el->values[i].data),
+                                          &res2, attrs2);
+                       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->types[i] = 7; /* RID type of some kind, not sure what the value means. */
+               }
+       }
+
+       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_DeleteDomainGroup 
+  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 *alias_name;
+       struct dom_sid *sid;
+       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 */
+       sid = dom_sid_add_rid(mem_ctx, d_state->domain_sid, r->in.rid);
+       if (sid == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       /* search for the group record */
+       ret = gendb_search(d_state->sam_ctx,
+                          mem_ctx, d_state->domain_dn, &msgs, attrs,
+                          "(&(objectSid=%s)(objectclass=group)"
+                          "(|(grouptype=%s)(grouptype=%s)))",
+                          ldap_encode_ndr_dom_sid(mem_ctx, sid),
+                          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, dom_sid_string(mem_ctx, sid)));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       alias_name = samdb_result_string(msgs[0], "sAMAccountName", NULL);
+       if (alias_name == NULL) {
+               DEBUG(0,("sAMAccountName field missing for sid %s\n", 
+                        dom_sid_string(mem_ctx, sid)));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       a_state = talloc(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, sid);
+       a_state->account_name = talloc_strdup(a_state, alias_name);
+       if (!a_state->account_name) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* create the policy handle */
+       g_handle = dcesrv_handle_new(dce_call->context, SAMR_HANDLE_ALIAS);
+       if (!g_handle) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       g_handle->data = talloc_steal(g_handle, a_state);
+
+       *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 = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+                             a_state->account_dn ,&res, attrs);
+       if (ret != 1) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+       msg = res[0];
+
+       /* allocate the info structure */
+       r->out.info = talloc(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;
+               return NT_STATUS_INVALID_INFO_CLASS;
+       }
+       
+       return NT_STATUS_OK;
+}
+
+
+/* 
+  samr_SetAliasInfo 
+*/
+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 *msg;
+       int ret;
+
+       DCESRV_PULL_HANDLE(h, r->in.alias_handle, SAMR_HANDLE_ALIAS);
+
+       a_state = h->data;
+
+       msg = ldb_msg_new(mem_ctx);
+       if (msg == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       msg->dn = ldb_dn_copy(mem_ctx, a_state->account_dn);
+       if (!msg->dn) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       switch (r->in.level) {
+       case ALIASINFODESCRIPTION:
+               SET_STRING(msg, description.string,         "description");
+               break;
+       case ALIASINFONAME:
+               /* On W2k3 this does not change the name, it changes the
+                * sAMAccountName attribute */
+               SET_STRING(msg, name.string,                "sAMAccountName");
+               break;
+       default:
+               return NT_STATUS_INVALID_INFO_CLASS;
+       }
+
+       /* modify the samdb record */
+       ret = samdb_replace(a_state->sam_ctx, mem_ctx, msg);
+       if (ret != 0) {
+               /* we really need samdb.c to return NTSTATUS */
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       return NT_STATUS_OK;
+}
+
+
+/* 
+  samr_DeleteDomAlias 
 */
-static NTSTATUS samr_DeleteDomainGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_DeleteDomainGroup *r)
+static NTSTATUS samr_DeleteDomAlias(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct samr_DeleteDomAlias *r)
 {
        struct dcesrv_handle *h;
        struct samr_account_state *a_state;
        int ret;
 
-        *r->out.group_handle = *r->in.group_handle;
+        *r->out.alias_handle = *r->in.alias_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;
 
@@ -1210,89 +2122,117 @@ static NTSTATUS samr_DeleteDomainGroup(struct dcesrv_call_state *dce_call, TALLO
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       ZERO_STRUCTP(r->out.group_handle);
+       ZERO_STRUCTP(r->out.alias_handle);
 
        return NT_STATUS_OK;
 }
 
 
 /* 
-  samr_DeleteGroupMember 
+  samr_AddAliasMember 
 */
-static NTSTATUS samr_DeleteGroupMember(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_DeleteGroupMember *r)
+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);
-}
+       struct dcesrv_handle *h;
+       struct samr_account_state *a_state;
+       struct samr_domain_state *d_state;
+       struct ldb_message *mod;
+       struct ldb_message **msgs;
+       const char * const attrs[2] = { "distinguishedName", NULL };
+       struct ldb_dn *memberdn = NULL;
+       int ret;
 
+       DCESRV_PULL_HANDLE(h, r->in.alias_handle, SAMR_HANDLE_ALIAS);
 
-/* 
-  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);
-}
+       a_state = h->data;
+       d_state = a_state->domain_state;
 
+       ret = gendb_search(d_state->sam_ctx, mem_ctx, NULL,
+                          &msgs, attrs, "(objectsid=%s)", 
+                          ldap_encode_ndr_dom_sid(mem_ctx, r->in.sid));
 
-/* 
-  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);
-}
+       if (ret == 1) {
+               memberdn = ldb_dn_explode(mem_ctx, ldb_msg_find_string(msgs[0], "distinguishedName", NULL));
+       } else  if (ret > 1) {
+               DEBUG(0,("Found %d records matching sid %s\n", 
+                        ret, dom_sid_string(mem_ctx, r->in.sid)));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       } else if (ret == 0) {
+               struct ldb_message *msg;
+               struct ldb_dn *basedn;
+               const char *sidstr;
 
+               sidstr = dom_sid_string(mem_ctx, r->in.sid);
+               NT_STATUS_HAVE_NO_MEMORY(sidstr);
 
-/* 
-  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);
-}
+               /* We might have to create a ForeignSecurityPrincipal, but
+                * only if it's not our own domain */
+               if (dom_sid_in_domain(d_state->domain_sid, r->in.sid))
+                       return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 
+               msg = ldb_msg_new(mem_ctx);
+               if (msg == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
 
-/* 
-  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);
-}
+               /* 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_dn(d_state->sam_ctx, mem_ctx, NULL,
+                                        "(&(objectClass=container)(cn=ForeignSecurityPrincipals))");
 
-/* 
-  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 (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 = ldb_dn_build_child(mem_ctx, "CN", sidstr, basedn);
+               if (msg->dn == NULL)
+                       return NT_STATUS_NO_MEMORY;
 
-/* 
-  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);
-}
+               memberdn = msg->dn;
 
+               samdb_msg_add_string(d_state->sam_ctx, mem_ctx, msg,
+                                    "objectClass",
+                                    "foreignSecurityPrincipal");
 
-/* 
-  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);
+               /* 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", ldb_dn_linearize(mem_ctx, msg->dn)));
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
+       } else {
+               DEBUG(0, ("samdb_search returned %d\n", ret));
+       }
+
+       if (memberdn == NULL) {
+               DEBUG(0, ("Could not find memberdn\n"));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       mod = ldb_msg_new(mem_ctx);
+       if (mod == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       mod->dn = talloc_reference(mem_ctx, a_state->account_dn);
+
+       if (samdb_msg_add_addval(d_state->sam_ctx, mem_ctx, mod, "member",
+                                ldb_dn_linearize(mem_ctx, 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;
 }
 
 
@@ -1302,7 +2242,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;
+       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;
+
+       memberdn = samdb_search_string(d_state->sam_ctx, mem_ctx, NULL,
+                                      "distinguishedName", "(objectSid=%s)", 
+                                      ldap_encode_ndr_dom_sid(mem_ctx, r->in.sid));
+
+       if (memberdn == NULL)
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+       mod = ldb_msg_new(mem_ctx);
+       if (mod == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       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;
 }
 
 
@@ -1312,9 +2284,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 = gendb_search_dn(d_state->sam_ctx, mem_ctx,
+                             a_state->account_dn, &msgs, attrs);
+
+       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(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 = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+                                          ldb_dn_explode(mem_ctx, el->values[i].data),
+                                          &msgs2, attrs2);
+                       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 
@@ -1325,7 +2349,8 @@ static NTSTATUS samr_OpenUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
        struct samr_domain_state *d_state;
        struct samr_account_state *a_state;
        struct dcesrv_handle *h;
-       const char *account_name, *sidstr;
+       const char *account_name;
+       struct dom_sid *sid;
        struct ldb_message **msgs;
        struct dcesrv_handle *u_handle;
        const char * const attrs[2] = { "sAMAccountName", NULL };
@@ -1338,52 +2363,53 @@ static NTSTATUS samr_OpenUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
        d_state = h->data;
 
        /* form the users SID */
-       sidstr = talloc_asprintf(mem_ctx, "%s-%u", d_state->domain_sid, r->in.rid);
-       if (!sidstr) {
+       sid = dom_sid_add_rid(mem_ctx, d_state->domain_sid, r->in.rid);
+       if (!sid) {
                return NT_STATUS_NO_MEMORY;
        }
 
        /* search for the user record */
-       ret = samdb_search(d_state->sam_ctx,
+       ret = gendb_search(d_state->sam_ctx,
                           mem_ctx, d_state->domain_dn, &msgs, attrs,
                           "(&(objectSid=%s)(objectclass=user))", 
-                          sidstr);
+                          ldap_encode_ndr_dom_sid(mem_ctx, sid));
        if (ret == 0) {
                return NT_STATUS_NO_SUCH_USER;
        }
        if (ret != 1) {
-               DEBUG(0,("Found %d records matching sid %s\n", ret, sidstr));
+               DEBUG(0,("Found %d records matching sid %s\n", ret, 
+                        dom_sid_string(mem_ctx, sid)));
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
        account_name = samdb_result_string(msgs[0], "sAMAccountName", NULL);
        if (account_name == NULL) {
-               DEBUG(0,("sAMAccountName field missing for sid %s\n", sidstr));
+               DEBUG(0,("sAMAccountName field missing for sid %s\n", 
+                        dom_sid_string(mem_ctx, sid)));
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
-       a_state = talloc_p(d_state, struct samr_account_state);
+       a_state = talloc(mem_ctx, 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(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, sid);
+       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);
+       u_handle = dcesrv_handle_new(dce_call->context, SAMR_HANDLE_USER);
        if (!u_handle) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       u_handle->data = a_state;
-       u_handle->destroy = samr_handle_destroy;
+       u_handle->data = talloc_steal(u_handle, a_state);
 
        *r->out.user_handle = u_handle->wire_handle;
 
@@ -1437,15 +2463,15 @@ static NTSTATUS samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
        a_state = h->data;
 
        /* pull all the user attributes */
-       ret = samdb_search(a_state->sam_ctx, mem_ctx, NULL, &res, NULL,
-                          "dn=%s", a_state->account_dn);
+       ret = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+                             a_state->account_dn ,&res, NULL);
        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_UserInfo);
+       r->out.info = talloc(mem_ctx, union samr_UserInfo);
        if (r->out.info == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1608,7 +2634,7 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
 {
        struct dcesrv_handle *h;
        struct samr_account_state *a_state;
-       struct ldb_message mod, *msg = &mod;
+       struct ldb_message *msg;
        int ret;
        NTSTATUS status = NT_STATUS_OK;
 
@@ -1616,9 +2642,13 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
 
        a_state = h->data;
 
-       ZERO_STRUCT(mod);
-       mod.dn = talloc_strdup(mem_ctx, a_state->account_dn);
-       if (!mod.dn) {
+       msg = ldb_msg_new(mem_ctx);
+       if (msg == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       msg->dn = talloc_reference(mem_ctx, a_state->account_dn);
+       if (!msg->dn) {
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -1637,6 +2667,10 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
                SET_STRING(msg, info6.full_name.string,        "displayName");
                break;
 
+       case 7:
+               SET_STRING(msg, info7.account_name.string,     "samAccountName");
+               break;
+
        case 8:
                SET_STRING(msg, info8.full_name.string,        "displayName");
                break;
@@ -1676,7 +2710,9 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
 
        case 21:
 #define IFSET(bit) if (bit & r->in.info->info21.fields_present)
-               IFSET(SAMR_FIELD_NAME)         
+               IFSET(SAMR_FIELD_ACCOUNT_NAME)         
+                       SET_STRING(msg, info21.account_name.string, "samAccountName");
+               IFSET(SAMR_FIELD_FULL_NAME)         
                        SET_STRING(msg, info21.full_name.string,    "displayName");
                IFSET(SAMR_FIELD_DESCRIPTION)  
                        SET_STRING(msg, info21.description.string,  "description");
@@ -1686,7 +2722,7 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
                        SET_STRING(msg, info21.logon_script.string, "scriptPath");
                IFSET(SAMR_FIELD_PROFILE_PATH)      
                        SET_STRING(msg, info21.profile_path.string, "profilePath");
-               IFSET(SAMR_FIELD_WORKSTATION)  
+               IFSET(SAMR_FIELD_WORKSTATIONS)  
                        SET_STRING(msg, info21.workstations.string, "userWorkstations");
                IFSET(SAMR_FIELD_LOGON_HOURS)  
                        SET_LHOURS(msg, info21.logon_hours,         "logonHours");
@@ -1706,7 +2742,9 @@ 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)         
+               IFSET(SAMR_FIELD_ACCOUNT_NAME)         
+                       SET_STRING(msg, info23.info.account_name.string, "samAccountName");
+               IFSET(SAMR_FIELD_FULL_NAME)         
                        SET_STRING(msg, info23.info.full_name.string,    "displayName");
                IFSET(SAMR_FIELD_DESCRIPTION)  
                        SET_STRING(msg, info23.info.description.string,  "description");
@@ -1716,7 +2754,7 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
                        SET_STRING(msg, info23.info.logon_script.string, "scriptPath");
                IFSET(SAMR_FIELD_PROFILE_PATH)      
                        SET_STRING(msg, info23.info.profile_path.string, "profilePath");
-               IFSET(SAMR_FIELD_WORKSTATION)  
+               IFSET(SAMR_FIELD_WORKSTATIONS)  
                        SET_STRING(msg, info23.info.workstations.string, "userWorkstations");
                IFSET(SAMR_FIELD_LOGON_HOURS)  
                        SET_LHOURS(msg, info23.info.logon_hours,         "logonHours");
@@ -1758,7 +2796,9 @@ 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)         
+               IFSET(SAMR_FIELD_ACCOUNT_NAME)         
+                       SET_STRING(msg, info25.info.account_name.string, "samAccountName");
+               IFSET(SAMR_FIELD_FULL_NAME)         
                        SET_STRING(msg, info25.info.full_name.string,    "displayName");
                IFSET(SAMR_FIELD_DESCRIPTION)  
                        SET_STRING(msg, info25.info.description.string,  "description");
@@ -1768,7 +2808,7 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
                        SET_STRING(msg, info25.info.logon_script.string, "scriptPath");
                IFSET(SAMR_FIELD_PROFILE_PATH)      
                        SET_STRING(msg, info25.info.profile_path.string, "profilePath");
-               IFSET(SAMR_FIELD_WORKSTATION)  
+               IFSET(SAMR_FIELD_WORKSTATIONS)  
                        SET_STRING(msg, info25.info.workstations.string, "userWorkstations");
                IFSET(SAMR_FIELD_LOGON_HOURS)  
                        SET_LHOURS(msg, info25.info.logon_hours,         "logonHours");
@@ -1835,7 +2875,63 @@ 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;
+       const char * const attrs[2] = { "objectSid", NULL };
+       struct samr_RidWithAttributeArray *array;
+       int count;
+
+       DCESRV_PULL_HANDLE(h, r->in.user_handle, SAMR_HANDLE_USER);
+
+       a_state = h->data;
+       d_state = a_state->domain_state;
+
+       count = samdb_search_domain(a_state->sam_ctx, mem_ctx, NULL, &res,
+                                   attrs, d_state->domain_sid,
+                                   "(&(member=%s)(grouptype=%s)(objectclass=group))",
+                                   ldb_dn_linearize(mem_ctx, a_state->account_dn),
+                                   ldb_hexstr(mem_ctx,
+                                              GTYPE_SECURITY_GLOBAL_GROUP));
+       if (count < 0)
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+       array = talloc(mem_ctx, struct samr_RidWithAttributeArray);
+       if (array == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       array->count = 0;
+       array->rids = NULL;
+
+       if (count > 0) {
+               int i;
+               array->rids = talloc_array(mem_ctx, struct samr_RidWithAttribute,
+                                           count);
+
+               if (array->rids == 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->rids[array->count].rid =
+                               group_sid->sub_auths[group_sid->num_auths-1];
+                       array->rids[array->count].attributes = SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED;
+                       array->count += 1;
+               }
+       }
+
+       r->out.rids = array;
+
+       return NT_STATUS_OK;
 }
 
 
@@ -1845,7 +2941,197 @@ 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 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;
+       }
+
+       /* 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,
+                                     d_state->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(mem_ctx,
+                                               struct samr_DispEntryGeneral,
+                                               ldb_cnt);
+               break;
+       case 2:
+       case 3:
+               entriesFull = talloc_array(mem_ctx,
+                                            struct samr_DispEntryFull,
+                                            ldb_cnt);
+               break;
+       case 4:
+       case 5:
+               entriesAscii = talloc_array(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 + 1;
+                       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 + 1;
+                       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 + 1;
+                       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;
 }
 
 
@@ -1894,10 +3180,12 @@ static NTSTATUS samr_GetUserPwInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 
        a_state = h->data;
 
-       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);
+       r->out.info.min_password_length = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0,
+                                                           a_state->domain_state->domain_dn, "minPwdLength", 
+                                                           NULL);
+       r->out.info.password_properties = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0,
+                                                           a_state->account_dn, 
+                                                           "pwdProperties", NULL);
        return NT_STATUS_OK;
 }
 
@@ -1908,7 +3196,65 @@ static NTSTATUS samr_GetUserPwInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 static NTSTATUS samr_RemoveMemberFromForeignDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct samr_RemoveMemberFromForeignDomain *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct dcesrv_handle *h;
+       struct samr_domain_state *d_state;
+       const char *memberdn;
+       struct ldb_message **res;
+       const char * const attrs[3] = { "distinguishedName", "objectSid", NULL };
+       int i, count;
+
+       DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
+
+       d_state = h->data;
+
+       memberdn = samdb_search_string(d_state->sam_ctx, mem_ctx, NULL,
+                                      "distinguishedName", "(objectSid=%s)", 
+                                      ldap_encode_ndr_dom_sid(mem_ctx, r->in.sid));
+       if (memberdn == NULL)
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+       /* TODO: Does this call only remove alias members, or does it do this
+        * for domain groups as well? */
+
+       count = samdb_search_domain(d_state->sam_ctx, mem_ctx,
+                                   d_state->domain_dn, &res, attrs,
+                                   d_state->domain_sid,
+                                   "(&(member=%s)(objectClass=group)"
+                                   "(|(groupType=%s)(groupType=%s)))",
+                                   memberdn,
+                                   ldb_hexstr(mem_ctx,
+                                              GTYPE_SECURITY_BUILTIN_LOCAL_GROUP),
+                                   ldb_hexstr(mem_ctx,
+                                              GTYPE_SECURITY_DOMAIN_LOCAL_GROUP));
+
+       if (count < 0)
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+
+       for (i=0; i<count; i++) {
+               struct ldb_message *mod;
+
+               mod = ldb_msg_new(mem_ctx);
+               if (mod == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               mod->dn = samdb_result_dn(mod, res[i], "distinguishedName", NULL);
+               if (mod->dn == NULL) {
+                       talloc_free(mod);
+                       continue;
+               }
+
+               if (samdb_msg_add_delval(d_state->sam_ctx, mem_ctx, mod,
+                                        "member", memberdn) != 0)
+                       return NT_STATUS_NO_MEMORY;
+
+               if (samdb_modify(d_state->sam_ctx, mem_ctx, mod) != 0)
+                       return NT_STATUS_UNSUCCESSFUL;
+
+               talloc_free(mod);
+       }
+
+       return NT_STATUS_OK;
 }
 
 
@@ -1933,6 +3279,7 @@ static NTSTATUS samr_QueryUserInfo2(struct dcesrv_call_state *dce_call, TALLOC_C
        struct samr_QueryUserInfo r1;
        NTSTATUS status;
 
+       ZERO_STRUCT(r1.out);
        r1.in.user_handle = r->in.user_handle;
        r1.in.level  = r->in.level;
        
@@ -1948,9 +3295,25 @@ static NTSTATUS samr_QueryUserInfo2(struct dcesrv_call_state *dce_call, TALLOC_C
   samr_QueryDisplayInfo2 
 */
 static NTSTATUS samr_QueryDisplayInfo2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct samr_QueryDisplayInfo2 *r)
+                                      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;
+       ZERO_STRUCT(q.out);
+
+       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;
 }
 
 
@@ -2008,31 +3371,30 @@ static NTSTATUS samr_GetDomPwInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
        struct ldb_message **msgs;
        int ret;
        const char * const attrs[] = {"minPwdLength", "pwdProperties", NULL };
-       void *sam_ctx;
+       struct ldb_context *sam_ctx;
 
        ZERO_STRUCT(r->out.info);
 
-       sam_ctx = samdb_connect(mem_ctx);
+       sam_ctx = samdb_connect(mem_ctx, dce_call->conn->auth_state.session_info); 
        if (sam_ctx == NULL) {
                return NT_STATUS_INVALID_SYSTEM_SERVICE;
        }
 
-       ret = samdb_search(sam_ctx, 
-                          mem_ctx, NULL, &msgs, attrs, 
-                          "(&(name=%s)(objectclass=domain))",
-                          lp_workgroup());
+       /* The domain name in this call is ignored */
+       ret = gendb_search_dn(sam_ctx, 
+                          mem_ctx, samdb_base_dn(mem_ctx), &msgs, attrs);
        if (ret <= 0) {
                return NT_STATUS_NO_SUCH_DOMAIN;
        }
        if (ret > 1) {
-               samdb_search_free(sam_ctx, mem_ctx, msgs);
+               talloc_free(msgs);
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
        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);
+       talloc_free(msgs);
 
        talloc_free(sam_ctx);
        return NT_STATUS_OK;