*/
#include "includes.h"
+#include "librpc/gen_ndr/ndr_samr.h"
+#include "rpc_server/dcerpc_server.h"
#include "rpc_server/common/common.h"
+#include "rpc_server/samr/dcesrv_samr.h"
+#include "system/time.h"
+#include "lib/ldb/include/ldb.h"
-/*
- this type allows us to distinguish handle types
-*/
-enum samr_handle {
- SAMR_HANDLE_CONNECT,
- SAMR_HANDLE_DOMAIN,
- SAMR_HANDLE_USER,
- SAMR_HANDLE_GROUP,
- SAMR_HANDLE_ALIAS
-};
-
-
-/*
- state asscoiated with a samr_Connect*() operation
-*/
-struct samr_connect_state {
- int reference_count;
- void *sam_ctx;
- TALLOC_CTX *mem_ctx;
- uint32 access_mask;
-};
-
-/*
- state associated with a samr_OpenDomain() operation
-*/
-struct samr_domain_state {
- struct samr_connect_state *connect_state;
- int reference_count;
- void *sam_ctx;
- TALLOC_CTX *mem_ctx;
- uint32 access_mask;
- const char *domain_sid;
- const char *domain_name;
- const char *domain_dn;
-};
-
-/*
- state associated with a open account handle
-*/
-struct samr_account_state {
- struct samr_domain_state *domain_state;
- void *sam_ctx;
- TALLOC_CTX *mem_ctx;
- uint32 access_mask;
- const char *account_sid;
- const char *account_name;
- const char *account_dn;
-};
-
-
-/*
- destroy connection state
-*/
-static void samr_Connect_close(struct samr_connect_state *c_state)
-{
- c_state->reference_count--;
- if (c_state->reference_count == 0) {
- samdb_close(c_state->sam_ctx);
- talloc_destroy(c_state->mem_ctx);
- }
-}
/*
- destroy an open connection. This closes the database connection
+ destroy a general handle.
*/
-static void samr_Connect_destroy(struct dcesrv_connection *conn, struct dcesrv_handle *h)
+static void samr_handle_destroy(struct dcesrv_connection *conn, struct dcesrv_handle *h)
{
- struct samr_connect_state *c_state = h->data;
- samr_Connect_close(c_state);
+ talloc_free(h->data);
}
/*
{
struct samr_connect_state *c_state;
struct dcesrv_handle *handle;
- TALLOC_CTX *connect_mem_ctx;
- ZERO_STRUCTP(r->out.handle);
+ ZERO_STRUCTP(r->out.connect_handle);
- connect_mem_ctx = talloc_init("samr_Connect");
- if (!connect_mem_ctx) {
- return NT_STATUS_NO_MEMORY;
- }
-
- c_state = talloc_p(connect_mem_ctx, struct samr_connect_state);
+ c_state = talloc_p(dce_call->conn, struct samr_connect_state);
if (!c_state) {
return NT_STATUS_NO_MEMORY;
}
- c_state->mem_ctx = connect_mem_ctx;
/* make sure the sam database is accessible */
- c_state->sam_ctx = samdb_connect();
+ c_state->sam_ctx = samdb_connect(c_state);
if (c_state->sam_ctx == NULL) {
- talloc_destroy(c_state->mem_ctx);
+ talloc_free(c_state);
return NT_STATUS_INVALID_SYSTEM_SERVICE;
}
handle = dcesrv_handle_new(dce_call->conn, SAMR_HANDLE_CONNECT);
if (!handle) {
- talloc_destroy(c_state->mem_ctx);
+ talloc_free(c_state);
return NT_STATUS_NO_MEMORY;
}
handle->data = c_state;
- handle->destroy = samr_Connect_destroy;
+ handle->destroy = samr_handle_destroy;
- c_state->reference_count = 1;
c_state->access_mask = r->in.access_mask;
- *r->out.handle = handle->wire_handle;
+ *r->out.connect_handle = handle->wire_handle;
return NT_STATUS_OK;
}
DCESRV_PULL_HANDLE(h, r->in.handle, DCESRV_HANDLE_ANY);
- /* this causes the callback samr_XXX_destroy() to be called by
+ /* this causes the parameters samr_XXX_destroy() to be called by
the handle destroy code which destroys the state associated
with the handle */
dcesrv_handle_destroy(dce_call->conn, h);
static NTSTATUS samr_QuerySecurity(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct samr_QuerySecurity *r)
{
- DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+ struct dcesrv_handle *h;
+ struct sec_desc_buf *sd;
+
+ r->out.sdbuf = NULL;
+
+ DCESRV_PULL_HANDLE(h, r->in.handle, DCESRV_HANDLE_ANY);
+
+ sd = talloc_p(mem_ctx, struct sec_desc_buf);
+ if (sd == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ sd->sd = samdb_default_security_descriptor(mem_ctx);
+
+ r->out.sdbuf = sd;
+
+ return NT_STATUS_OK;
}
r->out.sid = NULL;
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_CONNECT);
+ DCESRV_PULL_HANDLE(h, r->in.connect_handle, SAMR_HANDLE_CONNECT);
c_state = h->data;
- if (r->in.domain->name == NULL) {
+ if (r->in.domain->string == NULL) {
return NT_STATUS_INVALID_PARAMETER;
}
sidstr = samdb_search_string(c_state->sam_ctx,
mem_ctx, NULL, "objectSid",
"(&(name=%s)(objectclass=domain))",
- r->in.domain->name);
+ r->in.domain->string);
if (sidstr == NULL) {
return NT_STATUS_NO_SUCH_DOMAIN;
}
sid = dom_sid_parse_talloc(mem_ctx, sidstr);
if (sid == NULL) {
- DEBUG(1,("samdb: Invalid sid '%s' for domain %s\n",
- sidstr, r->in.domain->name));
+ DEBUG(0,("samdb: Invalid sid '%s' for domain %s\n",
+ sidstr, r->in.domain->string));
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
r->out.sam = NULL;
r->out.num_entries = 0;
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_CONNECT);
+ DCESRV_PULL_HANDLE(h, r->in.connect_handle, SAMR_HANDLE_CONNECT);
c_state = h->data;
mem_ctx, NULL, &domains,
"name", "(objectclass=domain)");
if (count == -1) {
- DEBUG(1,("samdb: no domains found in EnumDomains\n"));
+ DEBUG(0,("samdb: no domains found in EnumDomains\n"));
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
for (i=0;i<count-start_i;i++) {
array->entries[i].idx = start_i + i;
- array->entries[i].name.name = domains[start_i+i];
+ array->entries[i].name.string = domains[start_i+i];
}
r->out.sam = array;
- r->out.num_entries = i - start_i;
+ r->out.num_entries = i;
array->count = r->out.num_entries;
return NT_STATUS_OK;
}
-/*
- close an open domain context
-*/
-static void samr_Domain_close(struct dcesrv_connection *conn,
- struct samr_domain_state *d_state)
-{
- d_state->reference_count--;
- if (d_state->reference_count == 0) {
- samr_Connect_close(d_state->connect_state);
- talloc_destroy(d_state->mem_ctx);
- }
-}
-
-/*
- destroy an open domain context
-*/
-static void samr_Domain_destroy(struct dcesrv_connection *conn, struct dcesrv_handle *h)
-{
- struct samr_domain_state *d_state = h->data;
- samr_Domain_close(conn, d_state);
-}
-
/*
samr_OpenDomain
*/
const char *sidstr, *domain_name;
struct samr_connect_state *c_state;
struct samr_domain_state *d_state;
- TALLOC_CTX *mem_ctx2;
const char * const attrs[2] = { "name", NULL};
struct ldb_message **msgs;
int ret;
ZERO_STRUCTP(r->out.domain_handle);
- DCESRV_PULL_HANDLE(h_conn, r->in.handle, SAMR_HANDLE_CONNECT);
+ DCESRV_PULL_HANDLE(h_conn, r->in.connect_handle, SAMR_HANDLE_CONNECT);
c_state = h_conn->data;
return NT_STATUS_NO_SUCH_DOMAIN;
}
- mem_ctx2 = talloc_init("OpenDomain(%s)\n", domain_name);
- if (!mem_ctx2) {
- return NT_STATUS_NO_MEMORY;
- }
-
- d_state = talloc_p(mem_ctx2, struct samr_domain_state);
+ d_state = talloc_p(c_state, struct samr_domain_state);
if (!d_state) {
- talloc_destroy(mem_ctx2);
return NT_STATUS_NO_MEMORY;
}
- d_state->reference_count = 1;
- d_state->connect_state = c_state;
+ d_state->connect_state = talloc_reference(d_state, c_state);
d_state->sam_ctx = c_state->sam_ctx;
- d_state->mem_ctx = mem_ctx2;
- d_state->domain_sid = talloc_strdup(mem_ctx2, sidstr);
- d_state->domain_name = talloc_strdup(mem_ctx2, domain_name);
- d_state->domain_dn = talloc_strdup(mem_ctx2, msgs[0]->dn);
+ d_state->domain_sid = talloc_strdup(d_state, sidstr);
+ d_state->domain_name = talloc_strdup(d_state, domain_name);
+ d_state->domain_dn = talloc_strdup(d_state, msgs[0]->dn);
if (!d_state->domain_sid || !d_state->domain_name || !d_state->domain_dn) {
- talloc_destroy(mem_ctx2);
+ 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);
if (!h_domain) {
- talloc_destroy(mem_ctx2);
+ talloc_free(d_state);
return NT_STATUS_NO_MEMORY;
}
-
- c_state->reference_count++;
+
h_domain->data = d_state;
- h_domain->destroy = samr_Domain_destroy;
+ h_domain->destroy = samr_handle_destroy;
*r->out.domain_handle = h_domain->wire_handle;
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 };
+ int ret;
+ struct ldb_message **res;
+
+ ret = samdb_search(state->sam_ctx, mem_ctx, NULL, &res, attrs,
+ "dn=%s", state->domain_dn);
+ if (ret != 1) {
+ return NT_STATUS_INTERNAL_DB_CORRUPTION;
+ }
+
+ /* 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->primary.string = lp_netbios_name();
+ info->sequence_num = 0;
+ info->role = ROLE_DOMAIN_PDC;
+ info->num_users = samdb_search_count(state->sam_ctx, mem_ctx, NULL, "(objectClass=user)");
+ info->num_groups = samdb_search_count(state->sam_ctx, mem_ctx, NULL,
+ "(&(objectClass=group)(sAMAccountType=%u))",
+ ATYPE_GLOBAL_GROUP);
+ info->num_aliases = samdb_search_count(state->sam_ctx, mem_ctx, NULL,
+ "(&(objectClass=group)(sAMAccountType=%u))",
+ ATYPE_LOCAL_GROUP);
+
+ return NT_STATUS_OK;
+}
/*
samr_QueryDomainInfo
*/
static NTSTATUS samr_QueryDomainInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
- struct samr_QueryDomainInfo *r)
+ struct samr_QueryDomainInfo *r)
{
- DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+ struct dcesrv_handle *h;
+ struct samr_domain_state *d_state;
+
+ r->out.info = NULL;
+
+ DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
+
+ d_state = h->data;
+
+ r->out.info = talloc_p(mem_ctx, union samr_DomainInfo);
+ if (!r->out.info) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ ZERO_STRUCTP(r->out.info);
+
+ switch (r->in.level) {
+ case 2:
+ return samr_info_DomInfo2(d_state, mem_ctx, &r->out.info->info2);
+ }
+
+ return NT_STATUS_INVALID_INFO_CLASS;
}
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
}
-/*
- destroy an open account context
-*/
-static void samr_Account_destroy(struct dcesrv_connection *conn, struct dcesrv_handle *h)
-{
- struct samr_account_state *a_state = h->data;
- samr_Domain_close(conn, a_state->domain_state);
- talloc_destroy(a_state->mem_ctx);
-}
-
/*
samr_CreateDomainGroup
*/
struct dcesrv_handle *h;
const char *name;
struct ldb_message msg;
- uint32 rid;
- const char *groupname, *sidstr;
+ uint32_t rid;
+ const char *groupname, *sidstr, *guidstr;
+ struct GUID guid;
time_t now = time(NULL);
- TALLOC_CTX *mem_ctx2;
struct dcesrv_handle *g_handle;
int ret;
NTSTATUS status;
ZERO_STRUCTP(r->out.group_handle);
*r->out.rid = 0;
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_DOMAIN);
+ DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
d_state = h->data;
- groupname = r->in.name->name;
+ groupname = r->in.name->string;
if (groupname == NULL) {
return NT_STATUS_INVALID_PARAMETER;
}
/* check if the group already exists */
- name = samdb_search_string(d_state->sam_ctx, mem_ctx, d_state->domain_dn,
+ name = samdb_search_string(d_state->sam_ctx, mem_ctx, NULL,
"sAMAccountName",
"(&(sAMAccountName=%s)(objectclass=group))",
groupname);
ret = samdb_copy_template(d_state->sam_ctx, mem_ctx, &msg,
"(&(name=TemplateGroup)(objectclass=groupTemplate))");
if (ret != 0) {
- DEBUG(1,("Failed to load TemplateGroup from samdb\n"));
+ DEBUG(0,("Failed to load TemplateGroup from samdb\n"));
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
return NT_STATUS_NO_MEMORY;
}
+ /* a new GUID */
+ guid = GUID_random();
+ guidstr = GUID_string(mem_ctx, &guid);
+ if (!guidstr) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
/* add core elements to the ldb_message for the user */
msg.dn = talloc_asprintf(mem_ctx, "CN=%s,CN=Users,%s", groupname,
d_state->domain_dn);
if (!msg.dn) {
return NT_STATUS_NO_MEMORY;
}
- samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
- "name", groupname);
- samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
- "cn", groupname);
- samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
- "sAMAccountName", groupname);
- samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
- "objectClass", "group");
- samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg,
- "objectSid", sidstr);
- samdb_msg_set_ldaptime(d_state->sam_ctx, mem_ctx, &msg,
- "whenCreated", now);
- samdb_msg_set_ldaptime(d_state->sam_ctx, mem_ctx, &msg,
- "whenChanged", now);
+ samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "name", groupname);
+ samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "cn", groupname);
+ samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "sAMAccountName", groupname);
+ samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectClass", "group");
+ samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectSid", sidstr);
+ samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "objectGUID", guidstr);
+ samdb_msg_set_ldaptime(d_state->sam_ctx, mem_ctx, &msg, "whenCreated", now);
+ samdb_msg_set_ldaptime(d_state->sam_ctx, mem_ctx, &msg, "whenChanged", now);
/* create the group */
ret = samdb_add(d_state->sam_ctx, mem_ctx, &msg);
if (ret != 0) {
- DEBUG(1,("Failed to create group record %s\n", msg.dn));
+ DEBUG(0,("Failed to create group record %s\n", msg.dn));
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
- /* create group state and new policy handle */
- mem_ctx2 = talloc_init("CreateDomainGroup(%s)", groupname);
- if (!mem_ctx2) {
- return NT_STATUS_NO_MEMORY;
- }
-
- a_state = talloc_p(mem_ctx2, struct samr_account_state);
+ a_state = talloc_p(d_state, struct samr_account_state);
if (!a_state) {
return NT_STATUS_NO_MEMORY;
}
- a_state->mem_ctx = mem_ctx2;
a_state->sam_ctx = d_state->sam_ctx;
a_state->access_mask = r->in.access_mask;
- a_state->domain_state = d_state;
- a_state->account_dn = talloc_steal(mem_ctx, mem_ctx2, msg.dn);
- a_state->account_sid = talloc_strdup(mem_ctx2, sidstr);
- a_state->account_name = talloc_strdup(mem_ctx2, groupname);
+ a_state->domain_state = talloc_reference(a_state, d_state);
+ a_state->account_dn = talloc_steal(a_state, msg.dn);
+ a_state->account_sid = talloc_strdup(a_state, sidstr);
+ a_state->account_name = talloc_strdup(a_state, groupname);
if (!a_state->account_name || !a_state->account_sid) {
+ talloc_free(a_state);
return NT_STATUS_NO_MEMORY;
}
}
g_handle->data = a_state;
- g_handle->destroy = samr_Account_destroy;
-
- /* the domain state is in use one more time */
- d_state->reference_count++;
+ g_handle->destroy = samr_handle_destroy;
*r->out.group_handle = g_handle->wire_handle;
*r->out.rid = rid;
struct dcesrv_handle *h;
const char *name;
struct ldb_message msg;
- uint32 rid;
- const char *username, *sidstr;
+ uint32_t rid;
+ const char *account_name, *sidstr, *guidstr;
+ struct GUID guid;
time_t now = time(NULL);
- TALLOC_CTX *mem_ctx2;
struct dcesrv_handle *u_handle;
int ret;
NTSTATUS status;
+ const char *container, *additional_class=NULL;
- ZERO_STRUCTP(r->out.acct_handle);
+ ZERO_STRUCTP(r->out.user_handle);
*r->out.access_granted = 0;
*r->out.rid = 0;
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_DOMAIN);
+ DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
d_state = h->data;
- username = r->in.username->name;
+ account_name = r->in.account_name->string;
- if (username == NULL) {
+ if (account_name == NULL) {
return NT_STATUS_INVALID_PARAMETER;
}
/* check if the user already exists */
- name = samdb_search_string(d_state->sam_ctx, mem_ctx, d_state->domain_dn,
+ name = samdb_search_string(d_state->sam_ctx, mem_ctx, NULL,
"sAMAccountName",
- "(&(sAMAccountName=%s)(objectclass=user))", username);
+ "(&(sAMAccountName=%s)(objectclass=user))", account_name);
if (name != NULL) {
return NT_STATUS_USER_EXISTS;
}
ZERO_STRUCT(msg);
- /* 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(1,("Failed to load TemplateUser from samdb\n"));
- return NT_STATUS_INTERNAL_DB_CORRUPTION;
+ /* 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";
+
+ } 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;
+ }
+
+ container = "Computers";
+ additional_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;
+ }
+
+ container = "Domain Controllers";
+ additional_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 = "Users";
+ additional_class = "computer";
+
+ } else {
+ 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);
return NT_STATUS_NO_MEMORY;
}
+ /* a new GUID */
+ guid = GUID_random();
+ guidstr = GUID_string(mem_ctx, &guid);
+ if (!guidstr) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
/* add core elements to the ldb_message for the user */
- msg.dn = talloc_asprintf(mem_ctx, "CN=%s,CN=Users,%s", username, d_state->domain_dn);
+ 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;
}
- samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "name", username);
- samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "cn", username);
- samdb_msg_add_string(d_state->sam_ctx, mem_ctx, &msg, "sAMAccountName", username);
+ 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);
+ }
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);
if (ret != 0) {
- DEBUG(1,("Failed to create user record %s\n", msg.dn));
+ DEBUG(0,("Failed to create user record %s\n", msg.dn));
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
- /* create user state and new policy handle */
- mem_ctx2 = talloc_init("CreateUser(%s)", username);
- if (!mem_ctx2) {
- return NT_STATUS_NO_MEMORY;
- }
-
- a_state = talloc_p(mem_ctx2, struct samr_account_state);
+ a_state = talloc_p(d_state, struct samr_account_state);
if (!a_state) {
return NT_STATUS_NO_MEMORY;
}
- a_state->mem_ctx = mem_ctx2;
a_state->sam_ctx = d_state->sam_ctx;
a_state->access_mask = r->in.access_mask;
- a_state->domain_state = d_state;
- a_state->account_dn = talloc_steal(mem_ctx, mem_ctx2, msg.dn);
- a_state->account_sid = talloc_strdup(mem_ctx2, sidstr);
- a_state->account_name = talloc_strdup(mem_ctx2, username);
+ 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);
return NT_STATUS_NO_MEMORY;
}
/* create the policy handle */
u_handle = dcesrv_handle_new(dce_call->conn, SAMR_HANDLE_USER);
if (!u_handle) {
+ talloc_free(a_state);
return NT_STATUS_NO_MEMORY;
}
u_handle->data = a_state;
- u_handle->destroy = samr_Account_destroy;
+ u_handle->destroy = samr_handle_destroy;
/* the domain state is in use one more time */
- d_state->reference_count++;
+
- *r->out.acct_handle = u_handle->wire_handle;
+ *r->out.user_handle = u_handle->wire_handle;
*r->out.access_granted = 0xf07ff; /* TODO: fix access mask calculations */
*r->out.rid = rid;
struct samr_CreateUser *r)
{
struct samr_CreateUser2 r2;
- uint32 access_granted;
+ uint32_t access_granted = 0;
/* a simple wrapper around samr_CreateUser2 works nicely */
- r2.in.handle = r->in.handle;
- r2.in.username = r->in.username;
- r2.in.acct_flags = 1234;
+ r2.in.domain_handle = r->in.domain_handle;
+ r2.in.account_name = r->in.account_name;
+ r2.in.acct_flags = ACB_NORMAL;
r2.in.access_mask = r->in.access_mask;
- r2.out.acct_handle = r->out.acct_handle;
+ r2.out.user_handle = r->out.user_handle;
r2.out.access_granted = &access_granted;
r2.out.rid = r->out.rid;
r->out.sam = NULL;
r->out.num_entries = 0;
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_DOMAIN);
+ DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
d_state = h->data;
}
for (i=0;i<count;i++) {
entries[i].idx = samdb_result_rid_from_sid(mem_ctx, res[i], "objectSid", 0);
- entries[i].name.name = samdb_result_string(res[i], "sAMAccountName", "");
+ entries[i].name.string = samdb_result_string(res[i], "sAMAccountName", "");
}
/* sort the results by rid */
ZERO_STRUCT(r->out.rids);
ZERO_STRUCT(r->out.types);
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_DOMAIN);
+ DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
d_state = h->data;
return NT_STATUS_OK;
}
- r->out.rids.ids = talloc_array_p(mem_ctx, uint32, r->in.num_names);
- r->out.types.ids = talloc_array_p(mem_ctx, uint32, r->in.num_names);
+ r->out.rids.ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_names);
+ r->out.types.ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_names);
if (!r->out.rids.ids || !r->out.types.ids) {
return NT_STATUS_NO_MEMORY;
}
struct ldb_message **res;
struct dom_sid2 *sid;
const char *sidstr;
- uint32 atype, rtype;
+ 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].name);
+ "sAMAccountName=%s", r->in.names[i].string);
if (count != 1) {
status = STATUS_SOME_UNMAPPED;
continue;
continue;
}
- switch (atype & 0xF0000000) {
- case ATYPE_ACCOUNT:
- rtype = SID_NAME_USER;
- break;
- case ATYPE_GLOBAL_GROUP:
- rtype = SID_NAME_DOM_GRP;
- break;
- case ATYPE_LOCAL_GROUP:
- rtype = SID_NAME_ALIAS;
- break;
- default:
- DEBUG(1,("Unknown sAMAccountType 0x%08x\n", atype));
+ rtype = samdb_atype_map(atype);
+
+ if (rtype == SID_NAME_UNKNOWN) {
status = STATUS_SOME_UNMAPPED;
continue;
}
struct samr_account_state *a_state;
struct dcesrv_handle *h;
const char *groupname, *sidstr;
- TALLOC_CTX *mem_ctx2;
struct ldb_message **msgs;
struct dcesrv_handle *g_handle;
const char * const attrs[2] = { "sAMAccountName", NULL };
int ret;
- ZERO_STRUCTP(r->out.acct_handle);
+ ZERO_STRUCTP(r->out.group_handle);
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_DOMAIN);
+ DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
d_state = h->data;
return NT_STATUS_NO_SUCH_GROUP;
}
if (ret != 1) {
- DEBUG(1,("Found %d records matching sid %s\n", ret, sidstr));
+ DEBUG(0,("Found %d records matching sid %s\n", ret, sidstr));
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
groupname = samdb_result_string(msgs[0], "sAMAccountName", NULL);
if (groupname == NULL) {
- DEBUG(1,("sAMAccountName field missing for sid %s\n", sidstr));
+ DEBUG(0,("sAMAccountName field missing for sid %s\n", sidstr));
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
- /* create group state and new policy handle */
- mem_ctx2 = talloc_init("OpenGroup(%u)", r->in.rid);
- if (!mem_ctx2) {
- return NT_STATUS_NO_MEMORY;
- }
-
- a_state = talloc_p(mem_ctx2, struct samr_account_state);
+ a_state = talloc_p(d_state, struct samr_account_state);
if (!a_state) {
return NT_STATUS_NO_MEMORY;
}
- a_state->mem_ctx = mem_ctx2;
a_state->sam_ctx = d_state->sam_ctx;
a_state->access_mask = r->in.access_mask;
- a_state->domain_state = d_state;
- a_state->account_dn = talloc_steal(mem_ctx, mem_ctx2, msgs[0]->dn);
- a_state->account_sid = talloc_strdup(mem_ctx2, sidstr);
- a_state->account_name = talloc_strdup(mem_ctx2, groupname);
+ 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_name = talloc_strdup(a_state, groupname);
if (!a_state->account_name || !a_state->account_sid) {
return NT_STATUS_NO_MEMORY;
}
}
g_handle->data = a_state;
- g_handle->destroy = samr_Account_destroy;
+ g_handle->destroy = samr_handle_destroy;
- /* the domain state is in use one more time */
- d_state->reference_count++;
-
- *r->out.acct_handle = g_handle->wire_handle;
+ *r->out.group_handle = g_handle->wire_handle;
return NT_STATUS_OK;
}
#define QUERY_NTTIME(msg, field, attr) \
r->out.info->field = samdb_result_nttime(msg, attr, 0);
#define QUERY_APASSC(msg, field, attr) \
- r->out.info->field = samdb_result_allow_pwd_change(a_state->sam_ctx, mem_ctx, \
+ r->out.info->field = samdb_result_allow_password_change(a_state->sam_ctx, mem_ctx, \
a_state->domain_state->domain_dn, msg, attr);
#define QUERY_FPASSC(msg, field, attr) \
- r->out.info->field = samdb_result_force_pwd_change(a_state->sam_ctx, mem_ctx, \
+ r->out.info->field = samdb_result_force_password_change(a_state->sam_ctx, mem_ctx, \
a_state->domain_state->domain_dn, msg, attr);
#define QUERY_LHOURS(msg, field, attr) \
r->out.info->field = samdb_result_logon_hours(mem_ctx, msg, attr);
} while (0)
#define SET_LHOURS(msg, field, attr) do { \
- if (samdb_msg_add_logon_hours(a_state->sam_ctx, mem_ctx, msg, attr, r->in.info->field) != 0) { \
+ if (samdb_msg_add_logon_hours(a_state->sam_ctx, mem_ctx, msg, attr, &r->in.info->field) != 0) { \
return NT_STATUS_NO_MEMORY; \
} \
} while (0)
r->out.info = NULL;
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_GROUP);
+ DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
a_state = h->data;
/* Fill in the level */
switch (r->in.level) {
case GroupInfoAll:
- QUERY_STRING(msg, all.name.name, "sAMAccountName");
- r->out.info->all.unknown = 7; /* Do like w2k3 */
+ QUERY_STRING(msg, all.name.string, "sAMAccountName");
+ r->out.info->all.attributes = 7; /* Do like w2k3 */
QUERY_UINT (msg, all.num_members, "numMembers")
- QUERY_STRING(msg, all.description.name, "description");
+ QUERY_STRING(msg, all.description.string, "description");
break;
case GroupInfoName:
- QUERY_STRING(msg, name.name, "sAMAccountName");
+ QUERY_STRING(msg, name.string, "sAMAccountName");
break;
case GroupInfoX:
r->out.info->unknown.unknown = 7;
break;
case GroupInfoDescription:
- QUERY_STRING(msg, description.name, "description");
+ QUERY_STRING(msg, description.string, "description");
break;
default:
r->out.info = NULL;
struct dcesrv_handle *h;
struct samr_account_state *a_state;
struct ldb_message mod, *msg = &mod;
- int i, ret;
+ int ret;
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_GROUP);
+ DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
a_state = h->data;
switch (r->in.level) {
case GroupInfoDescription:
- SET_STRING(msg, description.name, "description");
+ SET_STRING(msg, description.string, "description");
break;
case GroupInfoName:
/* On W2k3 this does not change the name, it changes the
* sAMAccountName attribute */
- SET_STRING(msg, name.name, "sAMAccountName");
+ SET_STRING(msg, name.string, "sAMAccountName");
break;
case GroupInfoX:
/* This does not do anything obviously visible in W2k3 LDAP */
return NT_STATUS_INVALID_INFO_CLASS;
}
- /* mark all the message elements as LDB_FLAG_MOD_REPLACE */
- for (i=0;i<mod.num_elements;i++) {
- mod.elements[i].flags = LDB_FLAG_MOD_REPLACE;
- }
-
/* modify the samdb record */
- ret = samdb_modify(a_state->sam_ctx, mem_ctx, &mod);
+ ret = samdb_replace(a_state->sam_ctx, mem_ctx, &mod);
if (ret != 0) {
/* we really need samdb.c to return NTSTATUS */
return NT_STATUS_UNSUCCESSFUL;
struct samr_account_state *a_state;
int ret;
- *r->out.handle = *r->in.handle;
+ *r->out.group_handle = *r->in.group_handle;
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_GROUP);
+ DCESRV_PULL_HANDLE(h, r->in.group_handle, SAMR_HANDLE_GROUP);
a_state = h->data;
return NT_STATUS_UNSUCCESSFUL;
}
- ZERO_STRUCTP(r->out.handle);
+ ZERO_STRUCTP(r->out.group_handle);
return NT_STATUS_OK;
}
struct samr_domain_state *d_state;
struct samr_account_state *a_state;
struct dcesrv_handle *h;
- const char *username, *sidstr;
- TALLOC_CTX *mem_ctx2;
+ const char *account_name, *sidstr;
struct ldb_message **msgs;
struct dcesrv_handle *u_handle;
const char * const attrs[2] = { "sAMAccountName", NULL };
int ret;
- ZERO_STRUCTP(r->out.acct_handle);
+ ZERO_STRUCTP(r->out.user_handle);
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_DOMAIN);
+ DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
d_state = h->data;
return NT_STATUS_NO_SUCH_USER;
}
if (ret != 1) {
- DEBUG(1,("Found %d records matching sid %s\n", ret, sidstr));
+ DEBUG(0,("Found %d records matching sid %s\n", ret, sidstr));
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
- username = samdb_result_string(msgs[0], "sAMAccountName", NULL);
- if (username == NULL) {
- DEBUG(1,("sAMAccountName field missing for sid %s\n", sidstr));
+ account_name = samdb_result_string(msgs[0], "sAMAccountName", NULL);
+ if (account_name == NULL) {
+ DEBUG(0,("sAMAccountName field missing for sid %s\n", sidstr));
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
- /* create user state and new policy handle */
- mem_ctx2 = talloc_init("OpenUser(%u)", r->in.rid);
- if (!mem_ctx2) {
- return NT_STATUS_NO_MEMORY;
- }
-
- a_state = talloc_p(mem_ctx2, struct samr_account_state);
+ a_state = talloc_p(d_state, struct samr_account_state);
if (!a_state) {
return NT_STATUS_NO_MEMORY;
}
- a_state->mem_ctx = mem_ctx2;
a_state->sam_ctx = d_state->sam_ctx;
a_state->access_mask = r->in.access_mask;
- a_state->domain_state = d_state;
- a_state->account_dn = talloc_steal(mem_ctx, mem_ctx2, msgs[0]->dn);
- a_state->account_sid = talloc_strdup(mem_ctx2, sidstr);
- a_state->account_name = talloc_strdup(mem_ctx2, username);
+ 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) {
return NT_STATUS_NO_MEMORY;
}
}
u_handle->data = a_state;
- u_handle->destroy = samr_Account_destroy;
+ u_handle->destroy = samr_handle_destroy;
- /* the domain state is in use one more time */
- d_state->reference_count++;
-
- *r->out.acct_handle = u_handle->wire_handle;
+ *r->out.user_handle = u_handle->wire_handle;
return NT_STATUS_OK;
struct samr_account_state *a_state;
int ret;
- *r->out.handle = *r->in.handle;
+ *r->out.user_handle = *r->in.user_handle;
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_USER);
+ DCESRV_PULL_HANDLE(h, r->in.user_handle, SAMR_HANDLE_USER);
a_state = h->data;
return NT_STATUS_UNSUCCESSFUL;
}
- ZERO_STRUCTP(r->out.handle);
+ ZERO_STRUCTP(r->out.user_handle);
return NT_STATUS_OK;
}
r->out.info = NULL;
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_USER);
+ DCESRV_PULL_HANDLE(h, r->in.user_handle, SAMR_HANDLE_USER);
a_state = h->data;
/* fill in the reply */
switch (r->in.level) {
case 1:
- QUERY_STRING(msg, info1.username.name, "sAMAccountName");
- QUERY_STRING(msg, info1.full_name.name, "displayName");
- QUERY_UINT (msg, info1.primary_gid, "primaryGroupID");
- QUERY_STRING(msg, info1.description.name, "description");
- QUERY_STRING(msg, info1.comment.name, "comment");
+ QUERY_STRING(msg, info1.account_name.string, "sAMAccountName");
+ QUERY_STRING(msg, info1.full_name.string, "displayName");
+ QUERY_UINT (msg, info1.primary_gid, "primaryGroupID");
+ QUERY_STRING(msg, info1.description.string, "description");
+ QUERY_STRING(msg, info1.comment.string, "comment");
break;
case 2:
- QUERY_STRING(msg, info2.comment.name, "comment");
- QUERY_UINT (msg, info2.country_code, "countryCode");
- QUERY_UINT (msg, info2.code_page, "codePage");
+ QUERY_STRING(msg, info2.comment.string, "comment");
+ QUERY_UINT (msg, info2.country_code, "countryCode");
+ QUERY_UINT (msg, info2.code_page, "codePage");
break;
case 3:
- QUERY_STRING(msg, info3.username.name, "sAMAccountName");
- QUERY_STRING(msg, info3.full_name.name, "displayName");
- QUERY_RID (msg, info3.rid, "objectSid");
- QUERY_UINT (msg, info3.primary_gid, "primaryGroupID");
- QUERY_STRING(msg, info3.home_directory.name, "homeDirectory");
- QUERY_STRING(msg, info3.home_drive.name, "homeDrive");
- QUERY_STRING(msg, info3.logon_script.name, "scriptPath");
- QUERY_STRING(msg, info3.profile.name, "profilePath");
- QUERY_STRING(msg, info3.workstations.name, "userWorkstations");
- QUERY_NTTIME(msg, info3.last_logon, "lastLogon");
- QUERY_NTTIME(msg, info3.last_logoff, "lastLogoff");
- QUERY_NTTIME(msg, info3.last_pwd_change, "pwdLastSet");
- QUERY_APASSC(msg, info3.allow_pwd_change, "pwdLastSet");
- QUERY_FPASSC(msg, info3.force_pwd_change, "pwdLastSet");
- QUERY_LHOURS(msg, info3.logon_hours, "logonHours");
- QUERY_UINT (msg, info3.bad_pwd_count, "badPwdCount");
- QUERY_UINT (msg, info3.num_logons, "logonCount");
- QUERY_AFLAGS(msg, info3.acct_flags, "userAccountControl");
+ QUERY_STRING(msg, info3.account_name.string, "sAMAccountName");
+ QUERY_STRING(msg, info3.full_name.string, "displayName");
+ QUERY_RID (msg, info3.rid, "objectSid");
+ QUERY_UINT (msg, info3.primary_gid, "primaryGroupID");
+ QUERY_STRING(msg, info3.home_directory.string, "homeDirectory");
+ QUERY_STRING(msg, info3.home_drive.string, "homeDrive");
+ QUERY_STRING(msg, info3.logon_script.string, "scriptPath");
+ QUERY_STRING(msg, info3.profile_path.string, "profilePath");
+ QUERY_STRING(msg, info3.workstations.string, "userWorkstations");
+ QUERY_NTTIME(msg, info3.last_logon, "lastLogon");
+ QUERY_NTTIME(msg, info3.last_logoff, "lastLogoff");
+ QUERY_NTTIME(msg, info3.last_password_change, "pwdLastSet");
+ QUERY_APASSC(msg, info3.allow_password_change, "pwdLastSet");
+ QUERY_FPASSC(msg, info3.force_password_change, "pwdLastSet");
+ QUERY_LHOURS(msg, info3.logon_hours, "logonHours");
+ QUERY_UINT (msg, info3.bad_password_count, "badPwdCount");
+ QUERY_UINT (msg, info3.logon_count, "logonCount");
+ QUERY_AFLAGS(msg, info3.acct_flags, "userAccountControl");
break;
case 4:
- QUERY_LHOURS(msg, info4.logon_hours, "logonHours");
+ QUERY_LHOURS(msg, info4.logon_hours, "logonHours");
break;
case 5:
- QUERY_STRING(msg, info5.username.name, "sAMAccountName");
- QUERY_STRING(msg, info5.full_name.name, "displayName");
- QUERY_RID (msg, info5.rid, "objectSid");
- QUERY_UINT (msg, info5.primary_gid, "primaryGroupID");
- QUERY_STRING(msg, info5.home_directory.name, "homeDirectory");
- QUERY_STRING(msg, info5.home_drive.name, "homeDrive");
- QUERY_STRING(msg, info5.logon_script.name, "scriptPath");
- QUERY_STRING(msg, info5.profile.name, "profilePath");
- QUERY_STRING(msg, info5.description.name, "description");
- QUERY_STRING(msg, info5.workstations.name, "userWorkstations");
- QUERY_NTTIME(msg, info5.last_logon, "lastLogon");
- QUERY_NTTIME(msg, info5.last_logoff, "lastLogoff");
- QUERY_LHOURS(msg, info5.logon_hours, "logonHours");
- QUERY_UINT (msg, info5.bad_pwd_count, "badPwdCount");
- QUERY_UINT (msg, info5.num_logons, "logonCount");
- QUERY_NTTIME(msg, info5.last_pwd_change, "pwdLastSet");
- QUERY_NTTIME(msg, info5.acct_expiry, "accountExpires");
- QUERY_AFLAGS(msg, info5.acct_flags, "userAccountControl");
+ QUERY_STRING(msg, info5.account_name.string, "sAMAccountName");
+ QUERY_STRING(msg, info5.full_name.string, "displayName");
+ QUERY_RID (msg, info5.rid, "objectSid");
+ QUERY_UINT (msg, info5.primary_gid, "primaryGroupID");
+ QUERY_STRING(msg, info5.home_directory.string, "homeDirectory");
+ QUERY_STRING(msg, info5.home_drive.string, "homeDrive");
+ QUERY_STRING(msg, info5.logon_script.string, "scriptPath");
+ QUERY_STRING(msg, info5.profile_path.string, "profilePath");
+ QUERY_STRING(msg, info5.description.string, "description");
+ QUERY_STRING(msg, info5.workstations.string, "userWorkstations");
+ QUERY_NTTIME(msg, info5.last_logon, "lastLogon");
+ QUERY_NTTIME(msg, info5.last_logoff, "lastLogoff");
+ QUERY_LHOURS(msg, info5.logon_hours, "logonHours");
+ QUERY_UINT (msg, info5.bad_password_count, "badPwdCount");
+ QUERY_UINT (msg, info5.logon_count, "logonCount");
+ QUERY_NTTIME(msg, info5.last_password_change, "pwdLastSet");
+ QUERY_NTTIME(msg, info5.acct_expiry, "accountExpires");
+ QUERY_AFLAGS(msg, info5.acct_flags, "userAccountControl");
break;
case 6:
- QUERY_STRING(msg, info6.username.name, "sAMAccountName");
- QUERY_STRING(msg, info6.full_name.name, "displayName");
+ QUERY_STRING(msg, info6.account_name.string, "sAMAccountName");
+ QUERY_STRING(msg, info6.full_name.string, "displayName");
break;
case 7:
- QUERY_STRING(msg, info7.username.name, "sAMAccountName");
+ QUERY_STRING(msg, info7.account_name.string, "sAMAccountName");
break;
case 8:
- QUERY_STRING(msg, info8.full_name.name, "displayName");
+ QUERY_STRING(msg, info8.full_name.string, "displayName");
break;
case 9:
- QUERY_UINT (msg, info9.primary_gid, "primaryGroupID");
+ QUERY_UINT (msg, info9.primary_gid, "primaryGroupID");
break;
case 10:
- QUERY_STRING(msg, info10.home_directory.name, "homeDirectory");
- QUERY_STRING(msg, info10.home_drive.name, "homeDrive");
+ QUERY_STRING(msg, info10.home_directory.string,"homeDirectory");
+ QUERY_STRING(msg, info10.home_drive.string, "homeDrive");
break;
case 11:
- QUERY_STRING(msg, info11.logon_script.name, "scriptPath");
+ QUERY_STRING(msg, info11.logon_script.string, "scriptPath");
break;
case 12:
- QUERY_STRING(msg, info12.profile.name, "profilePath");
+ QUERY_STRING(msg, info12.profile_path.string, "profilePath");
break;
case 13:
- QUERY_STRING(msg, info13.description.name, "description");
+ QUERY_STRING(msg, info13.description.string, "description");
break;
case 14:
- QUERY_STRING(msg, info14.workstations.name, "userWorkstations");
+ QUERY_STRING(msg, info14.workstations.string, "userWorkstations");
break;
case 16:
- QUERY_AFLAGS(msg, info16.acct_flags, "userAccountControl");
+ QUERY_AFLAGS(msg, info16.acct_flags, "userAccountControl");
break;
case 17:
- QUERY_NTTIME(msg, info17.acct_expiry, "accountExpires");
+ QUERY_NTTIME(msg, info17.acct_expiry, "accountExpires");
case 20:
- QUERY_STRING(msg, info20.callback.name, "userParameters");
+ QUERY_STRING(msg, info20.parameters.string, "userParameters");
break;
case 21:
- QUERY_NTTIME(msg, info21.last_logon, "lastLogon");
- QUERY_NTTIME(msg, info21.last_logoff, "lastLogoff");
- QUERY_NTTIME(msg, info21.last_pwd_change, "pwdLastSet");
- QUERY_NTTIME(msg, info21.acct_expiry, "accountExpires");
- QUERY_APASSC(msg, info21.allow_pwd_change, "pwdLastSet");
- QUERY_FPASSC(msg, info21.force_pwd_change, "pwdLastSet");
- QUERY_STRING(msg, info21.username.name, "sAMAccountName");
- QUERY_STRING(msg, info21.full_name.name, "displayName");
- QUERY_STRING(msg, info21.home_directory.name, "homeDirectory");
- QUERY_STRING(msg, info21.home_drive.name, "homeDrive");
- QUERY_STRING(msg, info21.logon_script.name, "scriptPath");
- QUERY_STRING(msg, info21.profile.name, "profilePath");
- QUERY_STRING(msg, info21.description.name, "description");
- QUERY_STRING(msg, info21.workstations.name, "userWorkstations");
- QUERY_STRING(msg, info21.comment.name, "comment");
- QUERY_STRING(msg, info21.callback.name, "userParameters");
- QUERY_RID (msg, info21.rid, "objectSid");
- QUERY_UINT (msg, info21.primary_gid, "primaryGroupID");
- QUERY_AFLAGS(msg, info21.acct_flags, "userAccountControl");
+ QUERY_NTTIME(msg, info21.last_logon, "lastLogon");
+ QUERY_NTTIME(msg, info21.last_logoff, "lastLogoff");
+ QUERY_NTTIME(msg, info21.last_password_change, "pwdLastSet");
+ QUERY_NTTIME(msg, info21.acct_expiry, "accountExpires");
+ QUERY_APASSC(msg, info21.allow_password_change,"pwdLastSet");
+ QUERY_FPASSC(msg, info21.force_password_change,"pwdLastSet");
+ QUERY_STRING(msg, info21.account_name.string, "sAMAccountName");
+ QUERY_STRING(msg, info21.full_name.string, "displayName");
+ QUERY_STRING(msg, info21.home_directory.string,"homeDirectory");
+ QUERY_STRING(msg, info21.home_drive.string, "homeDrive");
+ QUERY_STRING(msg, info21.logon_script.string, "scriptPath");
+ QUERY_STRING(msg, info21.profile_path.string, "profilePath");
+ QUERY_STRING(msg, info21.description.string, "description");
+ QUERY_STRING(msg, info21.workstations.string, "userWorkstations");
+ QUERY_STRING(msg, info21.comment.string, "comment");
+ QUERY_STRING(msg, info21.parameters.string, "userParameters");
+ QUERY_RID (msg, info21.rid, "objectSid");
+ QUERY_UINT (msg, info21.primary_gid, "primaryGroupID");
+ QUERY_AFLAGS(msg, info21.acct_flags, "userAccountControl");
r->out.info->info21.fields_present = 0x00FFFFFF;
- QUERY_LHOURS(msg, info21.logon_hours, "logonHours");
- QUERY_UINT (msg, info21.bad_pwd_count, "badPwdCount");
- QUERY_UINT (msg, info21.num_logons, "logonCount");
- QUERY_UINT (msg, info21.country_code, "countryCode");
- QUERY_UINT (msg, info21.code_page, "codePage");
+ QUERY_LHOURS(msg, info21.logon_hours, "logonHours");
+ QUERY_UINT (msg, info21.bad_password_count, "badPwdCount");
+ QUERY_UINT (msg, info21.logon_count, "logonCount");
+ QUERY_UINT (msg, info21.country_code, "countryCode");
+ QUERY_UINT (msg, info21.code_page, "codePage");
break;
}
-/*
- set password via a samr_CryptPassword buffer
- this will in the 'msg' with modify operations that will update the user
- password when applied
-*/
-static NTSTATUS samr_set_password(struct dcesrv_call_state *dce_call,
- struct samr_account_state *a_state, TALLOC_CTX *mem_ctx,
- struct ldb_message *msg,
- struct samr_CryptPassword *pwbuf)
-{
- char new_pass[512];
- uint32 new_pass_len;
- DATA_BLOB session_key = dce_call->conn->session_key;
-
- SamOEMhashBlob(pwbuf->data, 516, &session_key);
-
- if (!decode_pw_buffer(pwbuf->data, new_pass, sizeof(new_pass),
- &new_pass_len, STR_UNICODE)) {
- DEBUG(3,("samr: failed to decode password buffer\n"));
- return NT_STATUS_WRONG_PASSWORD;
- }
-
- /* set the password - samdb needs to know both the domain and user DNs,
- so the domain password policy can be used */
- return samdb_set_password(a_state->sam_ctx, mem_ctx,
- a_state->account_dn, a_state->domain_state->domain_dn,
- msg, new_pass);
-}
-
/*
samr_SetUserInfo
*/
struct dcesrv_handle *h;
struct samr_account_state *a_state;
struct ldb_message mod, *msg = &mod;
- int i, ret;
+ int ret;
NTSTATUS status = NT_STATUS_OK;
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_USER);
+ DCESRV_PULL_HANDLE(h, r->in.user_handle, SAMR_HANDLE_USER);
a_state = h->data;
switch (r->in.level) {
case 2:
- SET_STRING(msg, info2.comment.name, "comment");
- SET_UINT (msg, info2.country_code, "countryCode");
- SET_UINT (msg, info2.code_page, "codePage");
+ SET_STRING(msg, info2.comment.string, "comment");
+ SET_UINT (msg, info2.country_code, "countryCode");
+ SET_UINT (msg, info2.code_page, "codePage");
break;
case 4:
- SET_LHOURS(msg, info4.logon_hours, "logonHours");
+ SET_LHOURS(msg, info4.logon_hours, "logonHours");
break;
case 6:
- SET_STRING(msg, info6.full_name.name, "displayName");
+ SET_STRING(msg, info6.full_name.string, "displayName");
break;
case 8:
- SET_STRING(msg, info8.full_name.name, "displayName");
+ SET_STRING(msg, info8.full_name.string, "displayName");
break;
case 9:
- SET_UINT(msg, info9.primary_gid, "primaryGroupID");
+ SET_UINT(msg, info9.primary_gid, "primaryGroupID");
break;
case 10:
- SET_STRING(msg, info10.home_directory.name, "homeDirectory");
- SET_STRING(msg, info10.home_drive.name, "homeDrive");
+ SET_STRING(msg, info10.home_directory.string, "homeDirectory");
+ SET_STRING(msg, info10.home_drive.string, "homeDrive");
break;
case 11:
- SET_STRING(msg, info11.logon_script.name, "scriptPath");
+ SET_STRING(msg, info11.logon_script.string, "scriptPath");
break;
case 12:
- SET_STRING(msg, info12.profile.name, "profilePath");
+ SET_STRING(msg, info12.profile_path.string, "profilePath");
break;
case 13:
- SET_STRING(msg, info13.description.name, "description");
+ SET_STRING(msg, info13.description.string, "description");
break;
case 14:
- SET_STRING(msg, info14.workstations.name, "userWorkstations");
+ SET_STRING(msg, info14.workstations.string, "userWorkstations");
break;
case 16:
- SET_AFLAGS(msg, info16.acct_flags, "userAccountControl");
+ SET_AFLAGS(msg, info16.acct_flags, "userAccountControl");
break;
case 20:
- SET_STRING(msg, info20.callback.name, "userParameters");
+ SET_STRING(msg, info20.parameters.string, "userParameters");
break;
case 21:
#define IFSET(bit) if (bit & r->in.info->info21.fields_present)
IFSET(SAMR_FIELD_NAME)
- SET_STRING(msg, info21.full_name.name, "displayName");
+ SET_STRING(msg, info21.full_name.string, "displayName");
IFSET(SAMR_FIELD_DESCRIPTION)
- SET_STRING(msg, info21.description.name, "description");
+ SET_STRING(msg, info21.description.string, "description");
IFSET(SAMR_FIELD_COMMENT)
- SET_STRING(msg, info21.comment.name, "comment");
+ SET_STRING(msg, info21.comment.string, "comment");
IFSET(SAMR_FIELD_LOGON_SCRIPT)
- SET_STRING(msg, info21.logon_script.name, "scriptPath");
- IFSET(SAMR_FIELD_PROFILE)
- SET_STRING(msg, info21.profile.name, "profilePath");
+ 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)
- SET_STRING(msg, info21.workstations.name, "userWorkstations");
+ SET_STRING(msg, info21.workstations.string, "userWorkstations");
IFSET(SAMR_FIELD_LOGON_HOURS)
- SET_LHOURS(msg, info21.logon_hours, "logonHours");
- IFSET(SAMR_FIELD_CALLBACK)
- SET_STRING(msg, info21.callback.name, "userParameters");
+ SET_LHOURS(msg, info21.logon_hours, "logonHours");
+ IFSET(SAMR_FIELD_ACCT_FLAGS)
+ SET_AFLAGS(msg, info21.acct_flags, "userAccountControl");
+ IFSET(SAMR_FIELD_PARAMETERS)
+ SET_STRING(msg, info21.parameters.string, "userParameters");
IFSET(SAMR_FIELD_COUNTRY_CODE)
- SET_UINT (msg, info21.country_code, "countryCode");
+ SET_UINT (msg, info21.country_code, "countryCode");
IFSET(SAMR_FIELD_CODE_PAGE)
- SET_UINT (msg, info21.code_page, "codePage");
+ SET_UINT (msg, info21.code_page, "codePage");
+
+
+ /* Any reason the rest of these can't be set? */
+#undef IFSET
+ break;
+
+ case 23:
+#define IFSET(bit) if (bit & r->in.info->info23.info.fields_present)
+ IFSET(SAMR_FIELD_NAME)
+ SET_STRING(msg, info23.info.full_name.string, "displayName");
+ IFSET(SAMR_FIELD_DESCRIPTION)
+ SET_STRING(msg, info23.info.description.string, "description");
+ IFSET(SAMR_FIELD_COMMENT)
+ SET_STRING(msg, info23.info.comment.string, "comment");
+ IFSET(SAMR_FIELD_LOGON_SCRIPT)
+ 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)
+ SET_STRING(msg, info23.info.workstations.string, "userWorkstations");
+ IFSET(SAMR_FIELD_LOGON_HOURS)
+ SET_LHOURS(msg, info23.info.logon_hours, "logonHours");
+ IFSET(SAMR_FIELD_ACCT_FLAGS)
+ SET_AFLAGS(msg, info23.info.acct_flags, "userAccountControl");
+ IFSET(SAMR_FIELD_PARAMETERS)
+ SET_STRING(msg, info23.info.parameters.string, "userParameters");
+ IFSET(SAMR_FIELD_COUNTRY_CODE)
+ SET_UINT (msg, info23.info.country_code, "countryCode");
+ IFSET(SAMR_FIELD_CODE_PAGE)
+ SET_UINT (msg, info23.info.code_page, "codePage");
+ IFSET(SAMR_FIELD_PASSWORD) {
+ status = samr_set_password(dce_call,
+ a_state->sam_ctx,
+ a_state->account_dn,
+ a_state->domain_state->domain_dn,
+ mem_ctx, msg,
+ &r->in.info->info23.password);
+ } else IFSET(SAMR_FIELD_PASSWORD2) {
+ status = samr_set_password(dce_call,
+ a_state->sam_ctx,
+ a_state->account_dn,
+ a_state->domain_state->domain_dn,
+ mem_ctx, msg,
+ &r->in.info->info23.password);
+ }
+#undef IFSET
break;
/* the set password levels are handled separately */
case 24:
- status = samr_set_password(dce_call, a_state, mem_ctx, msg,
+ status = samr_set_password(dce_call,
+ a_state->sam_ctx,
+ a_state->account_dn,
+ a_state->domain_state->domain_dn,
+ mem_ctx, msg,
&r->in.info->info24.password);
break;
+
+ case 25:
+#define IFSET(bit) if (bit & r->in.info->info25.info.fields_present)
+ IFSET(SAMR_FIELD_NAME)
+ SET_STRING(msg, info25.info.full_name.string, "displayName");
+ IFSET(SAMR_FIELD_DESCRIPTION)
+ SET_STRING(msg, info25.info.description.string, "description");
+ IFSET(SAMR_FIELD_COMMENT)
+ SET_STRING(msg, info25.info.comment.string, "comment");
+ IFSET(SAMR_FIELD_LOGON_SCRIPT)
+ 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)
+ SET_STRING(msg, info25.info.workstations.string, "userWorkstations");
+ IFSET(SAMR_FIELD_LOGON_HOURS)
+ SET_LHOURS(msg, info25.info.logon_hours, "logonHours");
+ IFSET(SAMR_FIELD_ACCT_FLAGS)
+ SET_AFLAGS(msg, info25.info.acct_flags, "userAccountControl");
+ IFSET(SAMR_FIELD_PARAMETERS)
+ SET_STRING(msg, info25.info.parameters.string, "userParameters");
+ IFSET(SAMR_FIELD_COUNTRY_CODE)
+ SET_UINT (msg, info25.info.country_code, "countryCode");
+ IFSET(SAMR_FIELD_CODE_PAGE)
+ SET_UINT (msg, info25.info.code_page, "codePage");
+ IFSET(SAMR_FIELD_PASSWORD) {
+ status = samr_set_password_ex(dce_call,
+ a_state->sam_ctx,
+ a_state->account_dn,
+ a_state->domain_state->domain_dn,
+ mem_ctx, msg,
+ &r->in.info->info25.password);
+ } else IFSET(SAMR_FIELD_PASSWORD2) {
+ status = samr_set_password_ex(dce_call,
+ a_state->sam_ctx,
+ a_state->account_dn,
+ a_state->domain_state->domain_dn,
+ mem_ctx, msg,
+ &r->in.info->info25.password);
+ }
+#undef IFSET
+ break;
+
+ /* the set password levels are handled separately */
+ case 26:
+ status = samr_set_password_ex(dce_call,
+ a_state->sam_ctx,
+ a_state->account_dn,
+ a_state->domain_state->domain_dn,
+ mem_ctx, msg,
+ &r->in.info->info26.password);
+ break;
default:
return status;
}
- /* mark all the message elements as LDB_FLAG_MOD_REPLACE,
- unless they are already marked with some other flag */
- for (i=0;i<mod.num_elements;i++) {
- if (mod.elements[i].flags == 0) {
- mod.elements[i].flags = LDB_FLAG_MOD_REPLACE;
- }
- }
-
/* modify the samdb record */
- ret = samdb_modify(a_state->sam_ctx, mem_ctx, msg);
+ 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;
}
-/*
- samr_ChangePasswordUser
-*/
-static NTSTATUS samr_ChangePasswordUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
- struct samr_ChangePasswordUser *r)
-{
- DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
-
-
/*
samr_GetGroupsForUser
*/
ZERO_STRUCT(r->out.info);
- DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_USER);
+ DCESRV_PULL_HANDLE(h, r->in.user_handle, SAMR_HANDLE_USER);
a_state = h->data;
- r->out.info.min_pwd_len = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "minPwdLength",
- "dn=%s", a_state->domain_state->domain_dn);
+ r->out.info.min_password_length = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "minPwdLength",
+ "dn=%s", a_state->domain_state->domain_dn);
r->out.info.password_properties = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "pwdProperties",
"dn=%s", a_state->account_dn);
return NT_STATUS_OK;
struct samr_QueryUserInfo r1;
NTSTATUS status;
- r1.in.handle = r->in.handle;
+ r1.in.user_handle = r->in.user_handle;
r1.in.level = r->in.level;
status = samr_QueryUserInfo(dce_call, mem_ctx, &r1);
}
-/*
- samr_OemChangePasswordUser2
-*/
-static NTSTATUS samr_OemChangePasswordUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
- struct samr_OemChangePasswordUser2 *r)
-{
- DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
-
-
-/*
- samr_ChangePasswordUser2
-*/
-static NTSTATUS samr_ChangePasswordUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
- struct samr_ChangePasswordUser2 *r)
-{
- DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
-
-
/*
samr_GetDomPwInfo
this fetches the default password properties for a domain
+
+ note that w2k3 completely ignores the domain name in this call, and
+ always returns the information for the servers primary domain
*/
static NTSTATUS samr_GetDomPwInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct samr_GetDomPwInfo *r)
const char * const attrs[] = {"minPwdLength", "pwdProperties", NULL };
void *sam_ctx;
- if (r->in.name == NULL || r->in.name->name == NULL) {
- return NT_STATUS_NO_SUCH_DOMAIN;
- }
+ ZERO_STRUCT(r->out.info);
- sam_ctx = samdb_connect();
+ sam_ctx = samdb_connect(mem_ctx);
if (sam_ctx == NULL) {
return NT_STATUS_INVALID_SYSTEM_SERVICE;
}
ret = samdb_search(sam_ctx,
mem_ctx, NULL, &msgs, attrs,
"(&(name=%s)(objectclass=domain))",
- r->in.name->name);
+ lp_workgroup());
if (ret <= 0) {
- samdb_close(sam_ctx);
return NT_STATUS_NO_SUCH_DOMAIN;
}
if (ret > 1) {
samdb_search_free(sam_ctx, mem_ctx, msgs);
- samdb_close(sam_ctx);
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
- r->out.info.min_pwd_len = samdb_result_uint(msgs[0], "minPwdLength", 0);
+ r->out.info.min_password_length = samdb_result_uint(msgs[0], "minPwdLength", 0);
r->out.info.password_properties = samdb_result_uint(msgs[0], "pwdProperties", 1);
samdb_search_free(sam_ctx, mem_ctx, msgs);
- samdb_close(sam_ctx);
+ talloc_free(sam_ctx);
return NT_STATUS_OK;
}
c.in.system_name = NULL;
c.in.access_mask = r->in.access_mask;
- c.out.handle = r->out.handle;
+ c.out.connect_handle = r->out.connect_handle;
return samr_Connect(dce_call, mem_ctx, &c);
}
{
struct samr_SetUserInfo r2;
- r2.in.handle = r->in.handle;
+ r2.in.user_handle = r->in.user_handle;
r2.in.level = r->in.level;
r2.in.info = r->in.info;
c.in.system_name = NULL;
c.in.access_mask = r->in.access_mask;
- c.out.handle = r->out.handle;
+ c.out.connect_handle = r->out.connect_handle;
return samr_Connect(dce_call, mem_ctx, &c);
}
c.in.system_name = NULL;
c.in.access_mask = r->in.access_mask;
- c.out.handle = r->out.handle;
+ c.out.connect_handle = r->out.connect_handle;
return samr_Connect(dce_call, mem_ctx, &c);
}
-/*
- samr_ChangePasswordUser3
-*/
-static NTSTATUS samr_ChangePasswordUser3(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
- struct samr_ChangePasswordUser3 *r)
-{
- DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
-
-
/*
samr_Connect5
*/
c.in.system_name = NULL;
c.in.access_mask = r->in.access_mask;
- c.out.handle = r->out.handle;
+ c.out.connect_handle = r->out.connect_handle;
status = samr_Connect(dce_call, mem_ctx, &c);
samr_ValidatePassword
*/
static NTSTATUS samr_ValidatePassword(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
- struct samr_ValidatePassword *r)
+ struct samr_ValidatePassword *r)
{
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
}
git.samba.org / samba.git / blobdiff