# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1348260341 -7200
# Node ID 0a3af34623439d2c953ed17317781091b3442aa9
# Parent  6e3df34ead39498bfd67931f32d62823a5c95fec
Avoid root permissions generally and allow for single daemon execution.

diff -r 6e3df34ead39 -r 0a3af3462343 jabberd/jabberd.spec
--- a/jabberd/jabberd.spec	Fri Sep 21 22:44:32 2012 +0200
+++ b/jabberd/jabberd.spec	Fri Sep 21 22:45:41 2012 +0200
@@ -189,6 +189,7 @@
     %{l_make} %{l_mflags -O}
 
 %if "%{with_mucon}" == "yes"
+#http://www.suramya.com/linux/tutorials/JabberSetup/
     loclibs=''
     case "%{l_platform -t}" in
         *-sunos* )
@@ -250,9 +251,10 @@
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%config %{l_prefix}/etc/jabberd/*' \
+        '%config %attr(0640,%{l_mgrp},%{l_ngrp}) %{l_prefix}/etc/jabberd/*' \
         '%dir %attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/jabberd' \
-        '%dir %attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/jabberd/*'
+        '%dir %attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/jabberd/*' \
+        '%dir %attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/jabberd/*/*'
 
 %files -f files
 
diff -r 6e3df34ead39 -r 0a3af3462343 jabberd/rc.jabberd
--- a/jabberd/rc.jabberd	Fri Sep 21 22:44:32 2012 +0200
+++ b/jabberd/rc.jabberd	Fri Sep 21 22:45:41 2012 +0200
@@ -16,12 +16,12 @@
 
 %common
     jabberd_signal () {
-        local retcode=0
+        local retcode=1
         local daemons=
         for daemons in $jabberd_daemons; do
             [ -f @l_prefix@/var/jabberd/pid/${daemons}.pid ] \
-            && kill -$1 `cat @l_prefix@/var/jabberd/pid/${daemons}.pid`
-            retcode=$(($retcode+$?))
+            && kill -$1 `cat @l_prefix@/var/jabberd/pid/${daemons}.pid` \
+            && retcode=$?
         done
         return $retcode
     }
@@ -56,7 +56,7 @@
     sleep 2
     rc jabberd start
 
-%daily -u @l_susr@
+%daily -u @l_nusr@
     rcService jabberd enable yes || exit 0
     logfiles=
     for daemons in $jabberd_daemons; do
@@ -64,7 +64,7 @@
     done
     shtool rotate -f \
         -n ${jabberd_log_numfiles} -s ${jabberd_log_minsize} -d \
-        -z ${jabberd_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+        -z ${jabberd_log_complevel} -m 644 -o @l_nusr@ -g @l_ngrp@ \
         -P "${jabberd_log_prolog}" \
         -E "${jabberd_log_epilog}; rc jabberd restart" \
         $logfiles