From a0a83802fbcb5e4d415315e4ea3a35db827785a3 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 2 May 2012 16:05:25 +1000 Subject: 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 --- source4/scripting/python/samba/upgrade.py | 3 +++ 1 file changed, 3 insertions(+) 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() -- cgit