The branch, master has been updated via f009fa15a17d29e41e04eb950bafaea084d2c31d (commit) via 8c58cef875b931cf6655d3b7002ed0a7fe32fe35 (commit) from 88e2fbaf95da3783e1ba41d55dd2fbd8b792126f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit f009fa15a17d29e41e04eb950bafaea084d2c31d Author: Andrew Tridgell <tri...@samba.org> Date: Fri Sep 11 17:14:01 2009 +1000 s4-provision: use DNS name, not domain name The SPNs end in the DNS domain name commit 8c58cef875b931cf6655d3b7002ed0a7fe32fe35 Author: Andrew Tridgell <tri...@samba.org> Date: Fri Sep 11 17:13:28 2009 +1000 s4-drs: actually call the new drsuapi_add_SPNs() code An early return here didn't do any good :-) ----------------------------------------------------------------------- Summary of changes: source4/rpc_server/drsuapi/addentry.c | 4 ++-- source4/scripting/python/samba/provision.py | 1 + source4/setup/provision_self_join_modify.ldif | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/rpc_server/drsuapi/addentry.c b/source4/rpc_server/drsuapi/addentry.c index ab190e1..4ccf14d 100644 --- a/source4/rpc_server/drsuapi/addentry.c +++ b/source4/rpc_server/drsuapi/addentry.c @@ -105,7 +105,7 @@ static WERROR drsuapi_add_SPNs(struct drsuapi_bind_state *b_state, el->values[0].length = strlen((char *)el->values[0].data); el->values[1].data = (uint8_t *)talloc_asprintf(el->values, "ldap/%s/%s", ntds_guid_str, dom_string); - el->values[1].length = strlen((char *)el->values[0].data); + el->values[1].length = strlen((char *)el->values[1].data); ret = ldb_modify(b_state->sam_ctx, msg); if (ret != LDB_SUCCESS) { @@ -173,7 +173,7 @@ WERROR dcesrv_drsuapi_DsAddEntry(struct dcesrv_call_state *dce_call, TALLOC_CTX r->out.ctr->ctr3.count = num; r->out.ctr->ctr3.objects = ids; - return WERR_OK; + break; default: return WERR_FOOBAR; } diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 2495299..07dfc62 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -801,6 +801,7 @@ def setup_self_join(samdb, names, # Setup fSMORoleOwner entries to point at the newly created DC entry setup_modify_ldif(samdb, setup_path("provision_self_join_modify.ldif"), { "DOMAIN": names.domain, + "DNSDOMAIN": names.dnsdomain, "DOMAINDN": names.domaindn, "CONFIGDN": names.configdn, "SCHEMADN": names.schemadn, diff --git a/source4/setup/provision_self_join_modify.ldif b/source4/setup/provision_self_join_modify.ldif index 200fc6c..dfcca72 100644 --- a/source4/setup/provision_self_join_modify.ldif +++ b/source4/setup/provision_self_join_modify.ldif @@ -31,5 +31,5 @@ interSiteTopologyGenerator: CN=NTDS Settings,${SERVERDN} dn: CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN} changetype: modify add: servicePrincipalName -servicePrincipalName: E3514235-4B06-11D1-AB04-00C04FC2DCD2/${NTDSGUID}/${DOMAIN} -servicePrincipalName: ldap/${NTDSGUID}._msdcs.${DOMAIN} +servicePrincipalName: E3514235-4B06-11D1-AB04-00C04FC2DCD2/${NTDSGUID}/${DNSDOMAIN} +servicePrincipalName: ldap/${NTDSGUID}._msdcs.${DNSDOMAIN} -- Samba Shared Repository