From 68f7b84140e59800b2a5c9c96b7a27f7a67235bb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Matthias=20Dieter=20Walln=C3=B6fer?= Date: Sat, 28 Nov 2009 16:59:18 +0100 Subject: [PATCH] s4:upgrade.py - readd accidentally removed empty lines Jelmer pointed out that this is against the PEP8 norm --- source4/scripting/python/samba/upgrade.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 205b43cf07d..c26448c0e4c 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -93,6 +93,7 @@ def import_sam_account(samldb,acc,domaindn,domainsid): "ntPwdHash:": acc.nt_password, }) + def import_sam_group(samldb, sid, gid, sid_name_use, nt_name, comment, domaindn): """Upgrade a SAM group. @@ -132,6 +133,7 @@ def import_sam_group(samldb, sid, gid, sid_name_use, nt_name, comment, domaindn) "samba3SidNameUse": str(sid_name_use) }) + def import_idmap(samdb,samba3_idmap,domaindn): """Import idmap data. @@ -156,6 +158,7 @@ def import_idmap(samdb,samba3_idmap,domaindn): "type": "group", "unixID": str(gid)}) + def import_wins(samba4_winsdb, samba3_winsdb): """Import settings from a Samba3 WINS database. @@ -221,6 +224,7 @@ replace: @LIST samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl}) + smbconf_keep = [ "dos charset", "unix charset", -- 2.11.4.GIT