sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

s4:upgrade.py - readd accidentally removed empty lines

Browse Source 
Jelmer pointed out that this is against the PEP8 norm
This commit is contained in:
Matthias Dieter Wallnöfer
2009-11-28 16:59:18 +01:00
parent ecfd1dfcbd
commit 68f7b84140
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source4/scripting/python/samba/upgrade.py
View File

@ -93,6 +93,7 @@ def import_sam_account(samldb,acc,domaindn,domainsid):
"ntPwdHash:": acc.nt_password, "ntPwdHash:": acc.nt_password,
}) })
def import_sam_group(samldb, sid, gid, sid_name_use, nt_name, comment, domaindn): def import_sam_group(samldb, sid, gid, sid_name_use, nt_name, comment, domaindn):
"""Upgrade a SAM group. """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) "samba3SidNameUse": str(sid_name_use)
}) })
def import_idmap(samdb,samba3_idmap,domaindn): def import_idmap(samdb,samba3_idmap,domaindn):
"""Import idmap data. """Import idmap data.
@ -156,6 +158,7 @@ def import_idmap(samdb,samba3_idmap,domaindn):
"type": "group", "type": "group",
"unixID": str(gid)}) "unixID": str(gid)})
def import_wins(samba4_winsdb, samba3_winsdb): def import_wins(samba4_winsdb, samba3_winsdb):
"""Import settings from a Samba3 WINS database. """Import settings from a Samba3 WINS database.
@ -221,6 +224,7 @@ replace: @LIST
samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl}) samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl})
smbconf_keep = [ smbconf_keep = [
"dos charset", "dos charset",
"unix charset", "unix charset",