summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-05-02 16:05:25 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-05-03 08:09:09 +1000
commita0a83802fbcb5e4d415315e4ea3a35db827785a3 (patch)
tree66d4ecb1f346e07b57401911d2a9f6dc1390262c
parent9cd664b2e9a01570d4beaf3dfc9e3f93b9370e63 (diff)
downloadsamba-a0a83802fbcb5e4d415315e4ea3a35db827785a3.tar.gz
samba-a0a83802fbcb5e4d415315e4ea3a35db827785a3.tar.bz2
samba-a0a83802fbcb5e4d415315e4ea3a35db827785a3.zip
s4-s3upgrade: Force ldapsam:trusted = yes
While this setting is not the default in Samba3, any domain that is in a suitable condition to upgrade to Samba4 should already be in the layout that ldapsam:trusted uses. It can be turned off by setting ldapsam:trusted=false in the smb.conf. Many upgrades to Samba4 happen on a different host to the old Samba3 domain and this avoids the need to configure nss_ldap only for the duration of the upgrade. Andrew Bartlett
-rw-r--r--source4/scripting/python/samba/upgrade.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index ce9683e127..7d6930681f 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -469,6 +469,9 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, useeadb=Fa
realm = samba3.lp.get("realm")
netbiosname = samba3.lp.get("netbios name")
+ if samba3.lp.get("ldapsam:trusted") is None:
+ samba3.lp.set("ldapsam:trusted", "yes")
+
# secrets db
try:
secrets_db = samba3.get_secrets_db()