mirror of
https://abf.rosa.ru/djam/samba.git
synced 2025-02-24 17:42:50 +00:00
25 lines
1.2 KiB
Diff
25 lines
1.2 KiB
Diff
diff -ruN samba-4.12.0_orig/python/samba/provision/__init__.py samba-4.12.0/python/samba/provision/__init__.py
|
|
--- samba-4.12.0_orig/python/samba/provision/__init__.py 2020-01-31 18:25:36.000000000 +0800
|
|
+++ samba-4.12.0/python/samba/provision/__init__.py 2020-03-19 15:31:58.309648340 +0800
|
|
@@ -2200,7 +2200,8 @@
|
|
root_gid = pwd.getpwuid(root_uid).pw_gid
|
|
|
|
try:
|
|
- bind_gid = findnss_gid(["bind", "named"])
|
|
+ # ROSA's bind package must have user group 'named' by default (package 9.11.4-P1-1 does not have it, but I'll make it have it)
|
|
+ bind_gid = findnss_gid(["named", "bind"])
|
|
except KeyError:
|
|
bind_gid = None
|
|
|
|
diff -ruN samba-4.12.0_orig/source4/scripting/bin/samba_upgradedns samba-4.12.0/source4/scripting/bin/samba_upgradedns
|
|
--- samba-4.12.0_orig/source4/scripting/bin/samba_upgradedns 2020-01-31 18:25:36.000000000 +0800
|
|
+++ samba-4.12.0/source4/scripting/bin/samba_upgradedns 2020-03-19 15:31:58.309648340 +0800
|
|
@@ -76,7 +76,7 @@
|
|
def find_bind_gid():
|
|
"""Find system group id for bind9
|
|
"""
|
|
- for name in ["bind", "named"]:
|
|
+ for name in ["named", "bind"]:
|
|
try:
|
|
return grp.getgrnam(name)[2]
|
|
except KeyError:
|