X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=server-role.patch;h=9cd2ec010a0e36b6b8165b6a718c762123576d1c;hb=d76287e73a07bf9e93491a6f680789abfc052605;hp=37077777b57810b8238dca5b48285c3ce07b77b7;hpb=9f0e7965eb6b7ced478144b228c9eb0691750a58;p=packages%2Fsamba.git

diff --git a/server-role.patch b/server-role.patch
index 3707777..9cd2ec0 100644
--- a/server-role.patch
+++ b/server-role.patch
@@ -1,31 +1,31 @@
---- samba-4.1.3/packaging/systemd/smb.service.orig	2013-12-20 19:15:20.885742895 +0100
-+++ samba-4.1.3/packaging/systemd/smb.service	2014-01-01 16:33:29.280076263 +0100
-@@ -7,6 +7,7 @@
+--- samba-4.7.4/packaging/systemd/smb.service.orig	2017-12-26 18:26:31.457609415 +0100
++++ samba-4.7.4/packaging/systemd/smb.service	2017-12-26 18:27:11.460942304 +0100
+@@ -8,6 +8,7 @@
  PIDFile=/run/samba/smbd.pid
  LimitNOFILE=16384
  EnvironmentFile=-/etc/sysconfig/samba
 +ExecStartPre=/bin/sh -c '[ "`samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -1`" != "active directory domain controller" ]'
- ExecStart=/usr/sbin/smbd $SMBDOPTIONS
+ ExecStart=/usr/sbin/smbd --foreground --no-process-group $SMBDOPTIONS
  ExecReload=/usr/bin/kill -HUP $MAINPID
- 
---- samba-4.1.3/packaging/systemd/nmb.service.orig	2013-12-20 19:15:20.885742895 +0100
-+++ samba-4.1.3/packaging/systemd/nmb.service	2014-01-01 16:38:17.089656135 +0100
-@@ -6,6 +6,8 @@
- Type=forking
+ LimitCORE=infinity
+--- samba-4.7.4/packaging/systemd/nmb.service.orig	2017-12-26 18:26:31.457609415 +0100
++++ samba-4.7.4/packaging/systemd/nmb.service	2017-12-26 18:27:32.350942051 +0100
+@@ -7,6 +7,8 @@
+ NotifyAccess=all
  PIDFile=/run/samba/nmbd.pid
  EnvironmentFile=-/etc/sysconfig/samba
 +ExecStartPre=/bin/sh -c '[ "`samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -1`" != "active directory domain controller" ]'
 +ExecStartPre=/bin/sh -c '[ "`testparm -s --parameter-name="disable netbios" 2>/dev/null`" != "Yes" ]'
- ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
+ ExecStart=/usr/sbin/nmbd --foreground --no-process-group $NMBDOPTIONS
  ExecReload=/usr/bin/kill -HUP $MAINPID
- 
---- samba-4.1.3/packaging/systemd/samba.service.orig	2014-01-01 16:44:59.833724642 +0100
-+++ samba-4.1.3/packaging/systemd/samba.service	2014-01-01 16:45:17.763905567 +0100
-@@ -7,6 +7,7 @@
+ LimitCORE=infinity
+--- samba-4.7.4/packaging/systemd/samba.service.orig	2017-12-26 18:26:31.457609415 +0100
++++ samba-4.7.4/packaging/systemd/samba.service	2017-12-26 18:27:52.774275149 +0100
+@@ -8,6 +8,7 @@
  PIDFile=/run/samba/samba.pid
  LimitNOFILE=16384
  EnvironmentFile=-/etc/sysconfig/samba
 +ExecStartPre=/bin/sh -c '[ "`samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -1`" = "active directory domain controller" ]'
- ExecStart=/usr/sbin/samba $SAMBAOPTIONS
+ ExecStart=/usr/sbin/samba --foreground --no-process-group $SAMBAOPTIONS
  ExecReload=/usr/bin/kill -HUP $MAINPID