sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-23 20:59:10 +03:00
Code Activity

s4:provision Remove all references to samba4LocalDomain

Browse Source 
This was a bad idea all along, as Simo said at the time.  With the
full MS schema and enforcement of it, it is an even worse idea.

This fixes the provision of the member server in 'make test'

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2009-10-12 16:44:19 +11:00
parent 0bfc3023a1
commit 1dfa2ed423
6 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source4/dsdb/common/util.c
View File

@ -1531,7 +1531,7 @@ int samdb_search_for_parent_domain(struct ldb_context *ldb, TALLOC_CTX *mem_ctx,
while ((sdn = ldb_dn_get_parent(local_ctx, sdn))) {
ret = ldb_search(ldb, local_ctx, &res, sdn, LDB_SCOPE_BASE, attrs,
"(|(|(objectClass=domain)(objectClass=builtinDomain))(objectClass=samba4LocalDomain))");
"(|(objectClass=domain)(objectClass=builtinDomain))");
if (ret == LDB_SUCCESS) {
if (res->count == 1) {
break;

2
source4/dsdb/samdb/ldb_modules/password_hash.c
View File

@ -1673,7 +1673,7 @@ static int build_domain_data_request(struct ph_context *ac)
ldb = ldb_module_get_ctx(ac->module);
filter = talloc_asprintf(ac,
"(&(objectSid=%s)(|(|(objectClass=domain)(objectClass=builtinDomain))(objectClass=samba4LocalDomain)))",
"(&(objectSid=%s)(|(objectClass=domain)(objectClass=builtinDomain)))",
ldap_encode_ndr_dom_sid(ac, ac->domain_sid));
if (filter == NULL) {
ldb_oom(ldb);

11
source4/dsdb/samdb/ldb_modules/samldb.c
View File

@ -284,8 +284,7 @@ static int samldb_get_parent_domain(struct samldb_ctx *ac)
ret = ldb_build_search_req(&req, ldb, ac,
dn, LDB_SCOPE_BASE,
"(|(objectClass=domain)"
"(objectClass=builtinDomain)"
"(objectClass=samba4LocalDomain))",
"(objectClass=builtinDomain))",
attrs,
NULL,
ac, samldb_get_parent_domain_callback,
@ -559,10 +558,10 @@ static int samldb_get_sid_domain(struct samldb_ctx *ac)
/* get the domain component part of the provided SID */
ac->domain_sid->num_auths--;
filter = talloc_asprintf(ac, "(&(objectSid=%s)"
"(|(objectClass=domain)"
"(objectClass=builtinDomain)"
"(objectClass=samba4LocalDomain)))",
filter = talloc_asprintf(ac,
"(&(objectSid=%s)"
"(|(objectClass=domain)"
"(objectClass=builtinDomain)))",
ldap_encode_ndr_dom_sid(ac, ac->domain_sid));
if (filter == NULL) {
return LDB_ERR_OPERATIONS_ERROR;

7
source4/scripting/python/samba/provision.py
View File

@ -454,7 +454,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
else:
domain = netbiosname
if domaindn is None:
domaindn = "CN=" + netbiosname
domaindn = "DC=" + netbiosname
assert domain is not None
domain = domain.upper()
@ -1010,10 +1010,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
samdb.set_invocation_id(invocationid)
message("Adding DomainDN: %s" % names.domaindn)
if serverrole == "domain controller":
domain_oc = "domainDNS"
else:
domain_oc = "samba4LocalDomain"
#impersonate domain admin
admin_session_info = admin_session(lp, str(domainsid))
@ -1024,7 +1020,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
domainguid_line = ""
setup_add_ldif(samdb, setup_path("provision_basedn.ldif"), {
"DOMAINDN": names.domaindn,
"DOMAIN_OC": domain_oc,
"DOMAINGUID": domainguid_line
})

2
source4/setup/provision_basedn.ldif
View File

@ -3,6 +3,6 @@
################################
dn: ${DOMAINDN}
objectClass: top
objectClass: ${DOMAIN_OC}
objectClass: domaindns
instanceType: 5
${DOMAINGUID}

43
source4/setup/schema_samba4.ldif
View File

@ -197,26 +197,29 @@ oMSyntax: 20
# Based on domainDNS, but without the DNS bits.
#
dn: CN=Samba4-Local-Domain,${SCHEMADN}
objectClass: top
objectClass: classSchema
cn: Samba4-Local-Domain
subClassOf: top
governsID: 1.3.6.1.4.1.7165.4.2.2
rDNAttID: cn
adminDisplayName: Samba4-Local-Domain
adminDescription: Samba4-Local-Domain
systemMayContain: msDS-Behavior-Version
systemMayContain: managedBy
objectClassCategory: 1
lDAPDisplayName: samba4LocalDomain
schemaIDGUID: 07be1647-8310-4fba-91ae-34e55d5a8293
systemOnly: FALSE
systemAuxiliaryClass: samDomain
defaultSecurityDescriptor: D:(A;;RPLCLORC;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)
systemFlags: 16
defaultHidingValue: TRUE
defaultObjectCategory: CN=Samba4-Local-Domain,${SCHEMADN}
#
# Not used anymore
#
#dn: CN=Samba4-Local-Domain,${SCHEMADN}
#objectClass: top
#objectClass: classSchema
#cn: Samba4-Local-Domain
#subClassOf: top
#governsID: 1.3.6.1.4.1.7165.4.2.2
#rDNAttID: cn
#adminDisplayName: Samba4-Local-Domain
#adminDescription: Samba4-Local-Domain
#systemMayContain: msDS-Behavior-Version
#systemMayContain: managedBy
#objectClassCategory: 1
#lDAPDisplayName: samba4LocalDomain
#schemaIDGUID: 07be1647-8310-4fba-91ae-34e55d5a8293
#systemOnly: FALSE
#systemAuxiliaryClass: samDomain
#defaultSecurityDescriptor: D:(A;;RPLCLORC;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)
#systemFlags: 16
#defaultHidingValue: TRUE
#defaultObjectCategory: CN=Samba4-Local-Domain,${SCHEMADN}
dn: CN=Samba4Top,${SCHEMADN}