sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

s4:provision - Fix up the provision of "standalone" and "member" mode

Browse Source 
Both modes weren't possible anymore since 1.) the secrets entry wasn't created,
2.) a lookup in winbindd was done using "lp_workgroup()" rather than
"lp_sam_name()" (since on the mentioned two configurations we use the netbios
name as domainname - and not the workgroup).
This commit is contained in:
Matthias Dieter Wallnöfer
2009-11-27 14:48:58 +01:00
parent a7fa3a9703
commit a5d854afbc
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1266,8 +1266,7 @@ def provision(setup_dir, message, session_info,
message("Setting up sam.ldb rootDSE marking as synchronized")
setup_modify_ldif(samdb, setup_path("provision_rootdse_modify.ldif"))
# Only make a zone file on the first DC, it should be replicated with DNS replication
if serverrole == "domain controller":
secretsdb_self_join(secrets_ldb, domain=names.domain,
realm=names.realm,
dnsdomain=names.dnsdomain,
@ -1276,6 +1275,7 @@ def provision(setup_dir, message, session_info,
machinepass=machinepass,
secure_channel_type=SEC_CHAN_BDC)
if serverrole == "domain controller":
secretsdb_setup_dns(secrets_ldb, setup_path,
realm=names.realm, dnsdomain=names.dnsdomain,
dns_keytab_path=paths.dns_keytab,
@ -1284,6 +1284,8 @@ def provision(setup_dir, message, session_info,
domainguid = samdb.searchone(basedn=domaindn, attribute="objectGUID")
assert isinstance(domainguid, str)
# Only make a zone file on the first DC, it should be replicated
# with DNS replication
create_zone_file(paths.dns, setup_path, dnsdomain=names.dnsdomain,
hostip=hostip,
hostip6=hostip6, hostname=names.hostname,

2
source4/winbind/wb_setup_domains.c
View File

@ -30,7 +30,7 @@ NTSTATUS wbsrv_setup_domains(struct wbsrv_service *service)
primary_sid = secrets_get_domain_sid(service,
service->task->event_ctx,
service->task->lp_ctx,
lp_workgroup(service->task->lp_ctx));
lp_sam_name(service->task->lp_ctx));
if (!primary_sid) {
return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
}