Author: nsantos
Date: Tue Apr 1 08:23:01 2008
New Revision: 643442
URL: http://svn.apache.org/viewvc?rev=643442&view=rev
Log:
QPID-892: Make qpidd daemon not run as root (rpm install)
Modified:
incubator/qpid/trunk/qpid/cpp/etc/qpidd
incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
Modified: incubator/qpid/trunk/qpid/cpp/etc/qpidd
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/qpidd?rev=643442&r1=643441&r2=643442&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/etc/qpidd (original)
+++ incubator/qpid/trunk/qpid/cpp/etc/qpidd Tue Apr 1 08:23:01 2008
@@ -31,7 +31,7 @@
start() {
echo -n $"Starting Qpid AMQP daemon: "
- daemon --check $prog $prog --daemon $QPIDD_OPTIONS
+ daemon --check $prog "runuser -s /bin/sh qpidd -c \"$prog --daemon
$QPIDD_OPTIONS\""
RETVAL=$?
echo
[ $RETVAL = 0 ] && touch $lockfile
Modified: incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.spec.in?rev=643442&r1=643441&r2=643442&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/qpidc.spec.in (original)
+++ incubator/qpid/trunk/qpid/cpp/qpidc.spec.in Tue Apr 1 08:23:01 2008
@@ -5,7 +5,7 @@
Name: @PACKAGE@
Version: @VERSION@
-Release: 24%{?dist}
+Release: 25%{?dist}
Summary: Libraries for Qpid C++ client applications
Group: System Environment/Libraries
License: Apache Software License
@@ -69,6 +69,13 @@
Libraries and header files for developing extensions to the
Qpid broker daemon.
+%pre
+getent group qpidd >/dev/null || groupadd -r qpidd
+getent passwd qpidd >/dev/null || \
+ useradd -r -m -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \
+ -c "Owner of Qpidd Daemons" qpidd
+exit 0
+
%prep
%setup -q
@@ -157,6 +164,9 @@
/sbin/ldconfig
%changelog
+* Mon Mar 31 2008 Nuno Santos <[EMAIL PROTECTED]> - 0.2-25
+- Create user qpidd, start qpidd service as qpidd
+
* Mon Feb 18 2008 Rafael Schloming <[EMAIL PROTECTED]> - 0.2-24
- Bug fix for TCK issue in Beta 3