From 8331142081aaa0a5874ad0f8fec2a6e350447b05 Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Thu, 23 Nov 2023 20:52:32 +1300 Subject: [PATCH] =?utf8?q?python:=20Remove=20unused=20parameter=20?= =?utf8?q?=E2=80=98name=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- python/samba/upgrade.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py index 366665ffc59..969f8ab8c0f 100644 --- a/python/samba/upgrade.py +++ b/python/samba/upgrade.py @@ -94,13 +94,12 @@ def import_sam_policy(samdb, policy, logger): logger.warn("Could not set account policy, (%s)", str(e)) -def add_posix_attrs(logger, samdb, sid, name, nisdomain, xid_type, home=None, +def add_posix_attrs(logger, samdb, sid, nisdomain, xid_type, home=None, shell=None, pgid=None): """Add posix attributes for the user/group :param samdb: Samba4 sam.ldb database :param sid: user/group sid - :param sid: user/group name :param nisdomain: name of the (fake) NIS domain :param xid_type: type of id (ID_TYPE_UID/ID_TYPE_GID) :param home: user homedir (Unix homepath) @@ -777,7 +776,7 @@ Please fix this account before attempting to upgrade again if g.gid != -1: add_group_from_mapping_entry(result.samdb, g, logger) add_ad_posix_idmap_entry(result.samdb, g.sid, g.gid, "ID_TYPE_GID", logger) - add_posix_attrs(samdb=result.samdb, sid=g.sid, name=g.nt_name, nisdomain=domainname.lower(), xid_type="ID_TYPE_GID", logger=logger) + add_posix_attrs(samdb=result.samdb, sid=g.sid, nisdomain=domainname.lower(), xid_type="ID_TYPE_GID", logger=logger) except: # We need this, so that we do not give even more errors due to not cancelling the transaction @@ -808,7 +807,7 @@ Please fix this account before attempting to upgrade again if (username in homes) and (homes[username] is not None) and \ (username in shells) and (shells[username] is not None) and \ (username in pgids) and (pgids[username] is not None): - add_posix_attrs(samdb=result.samdb, sid=userdata[username].user_sid, name=username, nisdomain=domainname.lower(), xid_type="ID_TYPE_UID", home=homes[username], shell=shells[username], pgid=pgids[username], logger=logger) + add_posix_attrs(samdb=result.samdb, sid=userdata[username].user_sid, nisdomain=domainname.lower(), xid_type="ID_TYPE_UID", home=homes[username], shell=shells[username], pgid=pgids[username], logger=logger) logger.info("Adding users to groups") # Start a new transaction (should speed this up a little, due to index churn) -- 2.47.2