- cosmetics

diff --git a/samba.init b/samba.init
index d4a9c0270ae25d861a99ce69241717c33d906005..70b61cc5080f08dc579b954f15c5cce537c22624 100644 (file)
--- a/samba.init
+++ b/samba.init
@@ -29,7 +29,7 @@ fi
 TMPDIR="/tmp"; export TMPDIR
 unset TMP || :
 
-SERVER_ROLE=`samba-tool testparm --parameter-name="server role"  2>/dev/null | tail -1`
+SERVER_ROLE=`samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -1`
 if [ "$SERVER_ROLE" != "active directory domain controller" ]; then
        exit 0
 fi

diff --git a/server-role.patch b/server-role.patch
index 8469230738651a4cbc917df72b91b4f7df3353fc..37077777b57810b8238dca5b48285c3ce07b77b7 100644 (file)
--- a/server-role.patch
+++ b/server-role.patch
@@ -4,7 +4,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" ]'
++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
  ExecReload=/usr/bin/kill -HUP $MAINPID
  
@@ -14,7 +14,7 @@
  Type=forking
  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 '[ "`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
  ExecReload=/usr/bin/kill -HUP $MAINPID
@@ -25,7 +25,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" ]'
++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
  ExecReload=/usr/bin/kill -HUP $MAINPID
  

diff --git a/winbind.init b/winbind.init
index a421fdecacfcecad8f9c77411eabd58a441602f0..c33bcca59986dbd8a1a2271c325b8d53a3c6857d 100644 (file)
--- a/winbind.init
+++ b/winbind.init
@@ -2,7 +2,7 @@
 #
 # chkconfig:   345 91 35
 # description: Starts and stops the Samba winbind daemon to provide\
-#              user and group information from a NT domain controller to linux.
+#              user and group information from a NT domain controller to linux.
 #
 # config:      /etc/samba/smb.conf