From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Thu, 23 Nov 2023 07:52:03 +0000 (+1300)
Subject: python: Remove unused parameter ‘netlogon’
X-Git-Tag: talloc-2.4.2~312
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=704ad18bf5ba3a0c2b923343a93a48b3d4cada50;p=thirdparty%2Fsamba.git

python: Remove unused parameter ‘netlogon’

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/netcmd/ntacl.py b/python/samba/netcmd/ntacl.py
index 022de076cba..34675c71375 100644
--- a/python/samba/netcmd/ntacl.py
+++ b/python/samba/netcmd/ntacl.py
@@ -407,7 +407,6 @@ class cmd_ntacl_sysvolreset(Command):
         creds.set_kerberos_state(DONT_USE_KERBEROS)
         logger = self.get_logger()
 
-        netlogon = lp.get("path", "netlogon")
         sysvol = lp.get("path", "sysvol")
         try:
             samdb = SamDB(session_info=system_session(),
@@ -447,7 +446,7 @@ class cmd_ntacl_sysvolreset(Command):
             logger.warning("Please note that POSIX permissions have NOT been changed, only the stored NT ACL")
 
         try:
-            provision.setsysvolacl(samdb, netlogon, sysvol,
+            provision.setsysvolacl(samdb, sysvol,
                                    LA_uid, BA_gid, domain_sid,
                                    lp.get("realm").lower(), samdb.domain_dn(),
                                    lp, use_ntvfs=use_ntvfs)
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index c323b969ea0..c40c809f398 100644
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -1660,12 +1660,11 @@ def set_gpos_acl(sysvol, dnsdomain, domainsid, domaindn, samdb, lp, use_ntvfs, p
                     passdb=passdb)
 
 
-def setsysvolacl(samdb, netlogon, sysvol, uid, gid, domainsid, dnsdomain,
+def setsysvolacl(samdb, sysvol, uid, gid, domainsid, dnsdomain,
                  domaindn, lp, use_ntvfs):
     """Set the ACL for the sysvol share and the subfolders
 
     :param samdb: An LDB object on the SAM db
-    :param netlogon: Physical path for the netlogon folder
     :param sysvol: Physical path for the sysvol folder
     :param uid: The UID of the "Administrator" user
     :param gid: The GID of the "Domain administrators" group
@@ -1979,7 +1978,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
         # Continue setting up sysvol for GPO. This appears to require being
         # outside a transaction.
         if not skip_sysvolacl:
-            setsysvolacl(samdb, paths.netlogon, paths.sysvol, paths.root_uid,
+            setsysvolacl(samdb, paths.sysvol, paths.root_uid,
                          paths.root_gid, names.domainsid, names.dnsdomain,
                          names.domaindn, lp, use_ntvfs)
         else:
diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
index 785e1018e59..366665ffc59 100644
--- a/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
@@ -841,7 +841,7 @@ Please fix this account before attempting to upgrade again
         logger.info("Administrator password has been set to password of user '%s'", admin_user)
 
     if result.server_role == "active directory domain controller":
-        setsysvolacl(result.samdb, result.paths.netlogon, result.paths.sysvol,
+        setsysvolacl(result.samdb, result.paths.sysvol,
                      result.paths.root_uid, result.paths.root_gid,
                      security.dom_sid(result.domainsid), result.names.dnsdomain,
                      result.names.domaindn, result.lp, use_ntvfs)