Merge branch 'master' into 'master'

Add patches fixing ipa-client-samba on Debian (#1012593, #1012592)

See merge request freeipa-team/freeipa!5
This commit is contained in:
Frederik Himpe 2025-02-24 11:19:26 +00:00
commit 20ae5ce7d8
3 changed files with 36 additions and 0 deletions

11
debian/patches/lockdir.patch vendored Normal file
View File

@ -0,0 +1,11 @@
--- a/ipaclient/install/ipa_client_samba.py 2025-02-24 10:25:07.103671553 +0100
+++ b/ipaclient/install/ipa_client_samba.py 2025-02-24 10:46:42.645416075 +0100
@@ -449,7 +449,7 @@
# in /var/lib/samba and /var/lib/samba/private
for smbpath in (paths.SAMBA_DIR,
os.path.join(paths.SAMBA_DIR, "private"),
- os.path.join(paths.SAMBA_DIR, "lock")):
+ "/run/samba":
tdb_files = [
os.path.join(smbpath, tdb_file)
for tdb_file in os.listdir(smbpath)

View File

@ -3,6 +3,8 @@
# not upstreamable
dnssec-race-wa.diff
fix-sssd-socket-activation.diff
unixgroup-nogroup.patch
lockdir.patch
# send upstream
map-ssh-service.diff

23
debian/patches/unixgroup-nogroup.patch vendored Normal file
View File

@ -0,0 +1,23 @@
--- a/ipaclient/install/ipa_client_samba.py 2025-02-24 10:25:07.103671553 +0100
+++ b/ipaclient/install/ipa_client_samba.py 2025-02-24 10:25:32.336109522 +0100
@@ -377,17 +377,17 @@
"groupmap",
"add",
"sid=S-1-5-32-546",
- "unixgroup=nobody",
+ "unixgroup=nogroup",
"type=builtin",
]
- logger.info("Map BUILTIN\\Guests to a group 'nobody'")
+ logger.info("Map BUILTIN\\Guests to a group 'nogroup'")
try:
ipautil.run(args)
except ipautil.CalledProcessError as e:
if "already mapped to SID S-1-5-32-546" not in e.stdout:
logger.error(
- 'Cannot map BUILTIN\\Guests to a group "nobody". Error: %s',
+ 'Cannot map BUILTIN\\Guests to a group "nogroup". Error: %s',
e
)
raise