samba/ROSA-bind-GID.patch
2019-01-24 20:16:15 +03:00

37 lines
1.3 KiB
Diff

From 371e987689d16074e43fb9f23e775120513f1d7c Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
Date: Thu, 24 Jan 2019 01:21:29 +0300
Subject: [PATCH] ROSA bind GID
ROSA's bind package must have user group 'named' by default
(package bind-9.11.4-P1-1 does not have it, but I'll make it have it)
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 066411ab8d7..1820d460360 100644
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -2128,7 +2128,8 @@ def provision(logger, session_info, smbconf=None,
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
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -77,7 +77,7 @@ __docformat__ = 'restructuredText'
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:
--
2.17.1