[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Fri Nov 27 09:47:16 MST 2009
The branch, master has been updated
via 663a1f5... s4:winbind - Fix it another time up
via 3318899... s4:provision.py - cosmetic
from 6c3e241... s4:samba3.py (and test) - deactivate the tests until those parameters are fixed
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 663a1f599aa163ebb5c81c02988c07cb1f0e3e6c
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date: Fri Nov 27 17:45:20 2009 +0100
s4:winbind - Fix it another time up
The first fix attempt did break some configurations (incl. "make test").
This now is the right fix with the right comment.
commit 33188999b5a346ed2a7114f678bfb3c2d5e7ca34
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date: Fri Nov 27 17:39:02 2009 +0100
s4:provision.py - cosmetic
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/provision.py | 15 +++++++--------
source4/winbind/wb_setup_domains.c | 16 ++++++++++++++--
2 files changed, 21 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 5bac6e6..0da03f3 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1135,7 +1135,7 @@ def provision(setup_dir, message, session_info,
os.mkdir(os.path.join(paths.private_dir,"tls"))
ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="")
-
+
schema = Schema(setup_path, domainsid, schemadn=names.schemadn, serverdn=names.serverdn)
if backend_type == "ldb":
@@ -1266,14 +1266,13 @@ 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"))
-
secretsdb_self_join(secrets_ldb, domain=names.domain,
- realm=names.realm,
- dnsdomain=names.dnsdomain,
- netbiosname=names.netbiosname,
- domainsid=domainsid,
- machinepass=machinepass,
- secure_channel_type=SEC_CHAN_BDC)
+ realm=names.realm,
+ dnsdomain=names.dnsdomain,
+ netbiosname=names.netbiosname,
+ domainsid=domainsid,
+ machinepass=machinepass,
+ secure_channel_type=SEC_CHAN_BDC)
if serverrole == "domain controller":
secretsdb_setup_dns(secrets_ldb, setup_path,
diff --git a/source4/winbind/wb_setup_domains.c b/source4/winbind/wb_setup_domains.c
index 6b4fd89..5ce6500 100644
--- a/source4/winbind/wb_setup_domains.c
+++ b/source4/winbind/wb_setup_domains.c
@@ -27,11 +27,23 @@ NTSTATUS wbsrv_setup_domains(struct wbsrv_service *service)
{
const struct dom_sid *primary_sid;
+ /*
+ * This is a bit more difficult here: when we are a domain controller
+ * or a joined domain member the first call will work. But if we are
+ * a standalone server or unjoined member then the second is the right
+ * one.
+ */
primary_sid = secrets_get_domain_sid(service,
service->task->event_ctx,
service->task->lp_ctx,
- lp_sam_name(service->task->lp_ctx));
- if (!primary_sid) {
+ lp_workgroup(service->task->lp_ctx));
+ if (primary_sid == NULL) {
+ primary_sid = secrets_get_domain_sid(service,
+ service->task->event_ctx,
+ service->task->lp_ctx,
+ lp_netbios_name(service->task->lp_ctx));
+ }
+ if (primary_sid == NULL) {
return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list