diff options
| author | David Wragg <dpw@lshift.net> | 2009-11-04 15:59:41 +0000 |
|---|---|---|
| committer | David Wragg <dpw@lshift.net> | 2009-11-04 15:59:41 +0000 |
| commit | 9a6f4b3558173d40a5d4b219e3e1f6f67d49ef4c (patch) | |
| tree | f8d16e0ed493385dff0a5d82f688ae5d6eb9329f | |
| parent | 80d77cb0fd6ca21a0624ae7263d0bf8b1f45c6aa (diff) | |
| parent | 9c9ac625926a8db82d25becf2fbd28751f25034e (diff) | |
| download | rabbitmq-server-9a6f4b3558173d40a5d4b219e3e1f6f67d49ef4c.tar.gz | |
Merge bug21802 into default
| -rw-r--r-- | packaging/common/rabbitmq-script-wrapper | 4 | ||||
| -rw-r--r-- | packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/packaging/common/rabbitmq-script-wrapper b/packaging/common/rabbitmq-script-wrapper index 0c4bd0a8..08e888cd 100644 --- a/packaging/common/rabbitmq-script-wrapper +++ b/packaging/common/rabbitmq-script-wrapper @@ -46,9 +46,11 @@ SCRIPT=`basename $0` if [ `id -u` = 0 ] ; then su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}" +elif [ `id -u` = `id -u rabbitmq` ] ; then + /usr/lib/rabbitmq/bin/${SCRIPT} "$@" else /usr/lib/rabbitmq/bin/${SCRIPT} - echo -e "\nOnly root should run ${SCRIPT}\n" + echo -e "\nOnly root or rabbitmq should run ${SCRIPT}\n" exit 1 fi diff --git a/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper b/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper index 0d7118c4..80cb7bd5 100644 --- a/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper +++ b/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper @@ -5,9 +5,11 @@ SCRIPT=`basename $0` if [ `id -u` = 0 ] ; then sudo -u rabbitmq -H /usr/lib/rabbitmq/bin/${SCRIPT} "$@" +elif [ `id -u` = `id -u rabbitmq` ] ; then + /usr/lib/rabbitmq/bin/${SCRIPT} "$@" else /usr/lib/rabbitmq/bin/${SCRIPT} - echo -e "\nOnly root should run ${SCRIPT}\n" + echo -e "\nOnly root or rabbitmq should run ${SCRIPT}\n" exit 1 fi |