mirror of
https://github.com/samba-team/samba.git
synced 2025-03-27 22:50:26 +03:00
s4:upgrade.py - readd accidentally removed empty lines
Jelmer pointed out that this is against the PEP8 norm
This commit is contained in:
parent
ecfd1dfcbd
commit
68f7b84140
@ -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",
|
||||
|
Loading…
x
Reference in New Issue
Block a user