1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-07 17:18:11 +03:00

r23815: Thanks to Matthias Wallnoefer <mwallnoefer@yahoo.de> for pointing out

that we had the wrong objectClass for OU=Domain
Controllers,${DOMAINDN} (was CN=Domain Controllers,${DOMAINDN})

This fixes both the SAMR server and the LDIF templates.

Andrew Bartlett
(This used to be commit 625a9e6c04)
This commit is contained in:
Andrew Bartlett 2007-07-10 13:26:10 +00:00 committed by Gerald (Jerry) Carter
parent 8f9922863f
commit 1cc770fc58
3 changed files with 8 additions and 8 deletions

View File

@ -1236,7 +1236,7 @@ static NTSTATUS dcesrv_samr_CreateUser2(struct dcesrv_call_state *dce_call, TALL
/* This must be one of these values *only* */
if (r->in.acct_flags == ACB_NORMAL) {
container = "Users";
container = "CN=Users";
obj_class = "user";
} else if (r->in.acct_flags == ACB_WSTRUST) {
@ -1244,7 +1244,7 @@ static NTSTATUS dcesrv_samr_CreateUser2(struct dcesrv_call_state *dce_call, TALL
return NT_STATUS_FOOBAR;
}
cn_name[cn_name_len - 1] = '\0';
container = "Computers";
container = "CN=Computers";
obj_class = "computer";
} else if (r->in.acct_flags == ACB_SVRTRUST) {
@ -1252,11 +1252,11 @@ static NTSTATUS dcesrv_samr_CreateUser2(struct dcesrv_call_state *dce_call, TALL
return NT_STATUS_FOOBAR;
}
cn_name[cn_name_len - 1] = '\0';
container = "Domain Controllers";
container = "OU=Domain Controllers";
obj_class = "computer";
} else if (r->in.acct_flags == ACB_DOMTRUST) {
container = "Users";
container = "CN=Users";
obj_class = "user";
} else {
@ -1266,7 +1266,7 @@ static NTSTATUS dcesrv_samr_CreateUser2(struct dcesrv_call_state *dce_call, TALL
/* add core elements to the ldb_message for the user */
msg->dn = ldb_dn_copy(mem_ctx, d_state->domain_dn);
if ( ! ldb_dn_add_child_fmt(msg->dn, "CN=%s,CN=%s", cn_name, container)) {
if ( ! ldb_dn_add_child_fmt(msg->dn, "CN=%s,%s", cn_name, container)) {
ldb_transaction_cancel(d_state->sam_ctx);
return NT_STATUS_FOOBAR;
}

View File

@ -1,6 +1,6 @@
dn: CN=Domain Controllers,${DOMAINDN}
dn: OU=Domain Controllers,${DOMAINDN}
objectClass: top
objectClass: container
objectClass: organizationalUnit
cn: Domain Controllers
description: Default container for domain controllers
instanceType: 4

View File

@ -1,6 +1,6 @@
#Join the DC to itself by default
dn: CN=${NETBIOSNAME},CN=Domain Controllers,${DOMAINDN}
dn: CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN}
objectClass: computer
cn: ${NETBIOSNAME}
userAccountControl: 532480