diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-11-28 16:59:18 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-11-28 18:29:49 +0100 |
| commit | 68f7b84140e59800b2a5c9c96b7a27f7a67235bb (patch) | |
| tree | 2c8e2717f09ae4574abc8a54341174b9a0930bd5 /source4/scripting/python/samba/upgrade.py | |
| parent | ecfd1dfcbd8f301b879942322f7fe765f03599bb (diff) | |
| download | samba-68f7b84140e59800b2a5c9c96b7a27f7a67235bb.tar.gz samba-68f7b84140e59800b2a5c9c96b7a27f7a67235bb.tar.bz2 samba-68f7b84140e59800b2a5c9c96b7a27f7a67235bb.zip | |
s4:upgrade.py - readd accidentally removed empty lines
Jelmer pointed out that this is against the PEP8 norm
Diffstat (limited to 'source4/scripting/python/samba/upgrade.py')
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 205b43cf07..c26448c0e4 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", |