If the user is not root, just invoke rabbitmqctl without any args. Theybug19859

should always get the help message, and always get the "run as root"
message.

1 files changed, 2 insertions, 6 deletions

diff --git a/packaging/debs/Debian/debian/rabbitmqctl_wrapper b/packaging/debs/Debian/debian/rabbitmqctl_wrapper
index 32f677f5..774731fc 100644
--- a/packaging/debs/Debian/debian/rabbitmqctl_wrapper
+++ b/packaging/debs/Debian/debian/rabbitmqctl_wrapper
@@ -13,13 +13,9 @@ cd /
 
 if [ ${UID} = 0 ] ; then
     su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/rabbitmqctl ${CMDLINE}"
-
-elif [ $# = 0 -o \( $# = 1 -a "$1" = --help \) ] ; then
-    # Allow normal user to run for the help message
-    /bin/sh -c "/usr/lib/rabbitmq/bin/rabbitmqctl ${CMDLINE}"
-
 else
-    echo "Only root should run $0"
+    /usr/lib/rabbitmq/bin/rabbitmqctl
+    echo -e "\nOnly root should run rabbitmqctl\n"
     exit 1
 fi