rediffed patches

[packages/samba.git] / server-role.patch

diff --git a/server-role.patch b/server-role.patch
index ea1ca81ae24b4b1df283b8ca466c1081be4dea20..2c2be360426dd2edab325ade802d5b16e9e6d9fb 100644 (file)
--- a/server-role.patch
+++ b/server-role.patch
@@ -6,18 +6,18 @@
  EnvironmentFile=-@SYSCONFDIR@/sysconfig/samba
 +ExecStartPre=/bin/sh -c '[ "`samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -1`" != "active directory domain controller" ]'
  ExecStart=@SBINDIR@/smbd --foreground --no-process-group $SMBDOPTIONS
- ExecReload=/usr/bin/kill -HUP $MAINPID
+ ExecReload=/bin/kill -HUP $MAINPID
  LimitCORE=infinity
 --- samba-4.7.4/packaging/systemd/nmb.service.in.orig  2017-12-26 18:26:31.457609415 +0100
 +++ samba-4.7.4/packaging/systemd/nmb.service.in       2017-12-26 18:27:32.350942051 +0100
 @@ -7,6 +7,8 @@
- NotifyAccess=all
+ Type=notify
  PIDFile=@PIDDIR@/nmbd.pid
  EnvironmentFile=-@SYSCONFDIR@/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=@SBINDIR@/nmbd --foreground --no-process-group $NMBDOPTIONS
- ExecReload=/usr/bin/kill -HUP $MAINPID
+ ExecReload=/bin/kill -HUP $MAINPID
  LimitCORE=infinity
 --- samba-4.7.4/packaging/systemd/samba.service.in.orig        2017-12-26 18:26:31.457609415 +0100
 +++ samba-4.7.4/packaging/systemd/samba.service.in     2017-12-26 18:27:52.774275149 +0100
@@ -27,5 +27,5 @@
  EnvironmentFile=-@SYSCONFDIR@/sysconfig/samba
 +ExecStartPre=/bin/sh -c '[ "`samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -1`" = "active directory domain controller" ]'
  ExecStart=@SBINDIR@/samba --foreground --no-process-group $SAMBAOPTIONS
- ExecReload=/usr/bin/kill -HUP $MAINPID
- 
+ ExecReload=/bin/kill -HUP $MAINPID
+ @systemd_samba_extra@