The branch, master has been updated
via d69d07c... s4-provision: Added msDS-NcType into samba4Top object
class
via 5cdd300... s4-provision: Fixed typos and redundant code
via ce70938... s4-provision: Disable populating FDS during instance
creation.
from 7564445... nsswitch: Move nss_err_str to its only caller
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d69d07ce62f2cb9468caf8d1a1dddc8082e0d492
Author: Endi S. Dewata <edew...@redhat.com>
Date: Mon Jan 18 21:47:24 2010 -0600
s4-provision: Added msDS-NcType into samba4Top object class
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
commit 5cdd30011c5b09fd9aac669047e0c2f60f558feb
Author: Endi S. Dewata <edew...@redhat.com>
Date: Mon Jan 18 21:01:08 2010 -0600
s4-provision: Fixed typos and redundant code
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
commit ce709389e61cdc538f9c071ece37ce97abad9292
Author: Endi S. Dewata <edew...@redhat.com>
Date: Tue Jan 19 23:10:19 2010 -0600
s4-provision: Disable populating FDS during instance creation.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/provisionbackend.py | 20 ++++++++++----------
source4/setup/fedorads.inf | 1 +
source4/setup/schema_samba4.ldif | 1 +
3 files changed, 12 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/provisionbackend.py
b/source4/scripting/python/samba/provisionbackend.py
index ae58a16..8241ed6 100644
--- a/source4/scripting/python/samba/provisionbackend.py
+++ b/source4/scripting/python/samba/provisionbackend.py
@@ -704,7 +704,7 @@ class FDSBackend(LDAPBackend):
os.path.join(self.paths.ldapdir, "slapd-samba4", "ldif2db"), "-s",
self.sambadn, "-i", self.samba_ldif],
close_fds=True, shell=False)
if retcode != 0:
- raise("ldif2db failed")
+ raise ProvisioningError("ldif2db failed")
def post_setup(self):
ldapi_db = Ldb(self.ldapi_uri, credentials=self.credentials)
@@ -717,16 +717,16 @@ class FDSBackend(LDAPBackend):
dn = str(res[i]["dn"])
ldapi_db.delete(dn)
- aci = """(targetattr = "*") (version 3.0;acl "full access to all
by samba-admin";allow (all)(userdn = "ldap:///CN=samba-admin,%s";);)""" %
self.sambadn
+ aci = """(targetattr = "*") (version 3.0;acl "full access to all by
samba-admin";allow (all)(userdn = "ldap:///CN=samba-admin,%s";);)""" %
self.sambadn
- m = ldb.Message()
- m["aci"] = ldb.MessageElement([aci], ldb.FLAG_MOD_REPLACE, "aci")
+ m = ldb.Message()
+ m["aci"] = ldb.MessageElement([aci], ldb.FLAG_MOD_REPLACE, "aci")
- m.dn = ldb.Dn(1, self.names.domaindn)
- ldapi_db.modify(m)
+ m.dn = ldb.Dn(ldapi_db, self.names.domaindn)
+ ldapi_db.modify(m)
- m.dn = ldb.Dn(1, self.names.configdn)
- ldapi_db.modify(m)
+ m.dn = ldb.Dn(ldapi_db, self.names.configdn)
+ ldapi_db.modify(m)
- m.dn = ldb.Dn(1, self.names.schemadn)
- ldapi_db.modify(m)
+ m.dn = ldb.Dn(ldapi_db, self.names.schemadn)
+ ldapi_db.modify(m)
diff --git a/source4/setup/fedorads.inf b/source4/setup/fedorads.inf
index 2dda1bc..f4f92a0 100644
--- a/source4/setup/fedorads.inf
+++ b/source4/setup/fedorads.inf
@@ -25,6 +25,7 @@ cert_dir= ${LDAPDIR}/slapd-samba4
start_server= 0
install_full_schema= 0
+InstallLdifFile= none
SchemaFile=${LDAPDIR}/99_ad.ldif
ConfigFile = ${LDAPDIR}/fedorads-partitions.ldif
ConfigFile = ${LDAPDIR}/fedorads-sasl.ldif
diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif
index e28aa0e..401af16 100644
--- a/source4/setup/schema_samba4.ldif
+++ b/source4/setup/schema_samba4.ldif
@@ -277,6 +277,7 @@ systemMayContain: netbootSCPBL
systemMayContain: ownerBL
systemMayContain: msDS-ReplValueMetaData
systemMayContain: msDS-ReplAttributeMetaData
+systemMayContain: msDS-NcType
systemMayContain: msDS-NonMembersBL
systemMayContain: msDS-NCReplOutboundNeighbors
systemMayContain: msDS-NCReplInboundNeighbors
--
Samba Shared Repository
