Commit 574ff8c0 authored by Marco Mariani's avatar Marco Mariani

removed checks for zimbra user and sudo calls

parent 11acaf6e
...@@ -14,10 +14,11 @@ ...@@ -14,10 +14,11 @@
# ***** END LICENSE BLOCK ***** # ***** END LICENSE BLOCK *****
# #
if [ x`whoami` != xzimbra ]; then ## XXX SLAPOS user will not be 'zimbra'
echo Error: must be run as zimbra user #if [ x`whoami` != xzimbra ]; then
exit 1 # echo Error: must be run as zimbra user
fi # exit 1
#fi
source `dirname $0`/zmshutil || exit 1 source `dirname $0`/zmshutil || exit 1
zmsetvars \ zmsetvars \
......
...@@ -69,7 +69,7 @@ case "$1" in ...@@ -69,7 +69,7 @@ case "$1" in
if [ "x$2" = "x" ]; then if [ "x$2" = "x" ]; then
${zimbra_home}/bin/zmtlsctl > /dev/null 2>&1 ${zimbra_home}/bin/zmtlsctl > /dev/null 2>&1
fi fi
sudo ${zimbra_home}/libexec/zmmailboxdmgr status ${zimbra_home}/libexec/zmmailboxdmgr status
if [ $? = 0 ]; then if [ $? = 0 ]; then
echo "mailboxd already running." echo "mailboxd already running."
exit 0 exit 0
...@@ -105,7 +105,7 @@ case "$1" in ...@@ -105,7 +105,7 @@ case "$1" in
mailboxd_java_options="${mailboxd_java_options} -Dsun.net.inetaddr.ttl=${networkaddress_cache_ttl}" mailboxd_java_options="${mailboxd_java_options} -Dsun.net.inetaddr.ttl=${networkaddress_cache_ttl}"
fi fi
echo -n "Starting mailboxd..." echo -n "Starting mailboxd..."
sudo ${zimbra_home}/libexec/zmmailboxdmgr start \ ${zimbra_home}/libexec/zmmailboxdmgr start \
-Dfile.encoding=UTF-8 ${mailboxd_java_options} ${spnegoJavaOptions} -Xms${javaXms}m \ -Dfile.encoding=UTF-8 ${mailboxd_java_options} ${spnegoJavaOptions} -Xms${javaXms}m \
-Xmx${javaXmx}m -Xmn${javaXmn}m < /dev/null > /dev/null 2>&1 -Xmx${javaXmx}m -Xmn${javaXmn}m < /dev/null > /dev/null 2>&1
status=$? status=$?
...@@ -119,13 +119,13 @@ case "$1" in ...@@ -119,13 +119,13 @@ case "$1" in
'kill'|'stop') 'kill'|'stop')
echo -n "Stopping mailboxd..." echo -n "Stopping mailboxd..."
sudo ${zimbra_home}/libexec/zmmailboxdmgr status ${zimbra_home}/libexec/zmmailboxdmgr status
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "mailboxd is not running." echo "mailboxd is not running."
exit 0 exit 0
fi fi
${zimbra_home}/bin/zmthrdump -i -o ${zimbra_home}/log/stacktrace.$$.$(date +%Y%m%d%H%M%S) 2> /dev/null ${zimbra_home}/bin/zmthrdump -i -o ${zimbra_home}/log/stacktrace.$$.$(date +%Y%m%d%H%M%S) 2> /dev/null
sudo ${zimbra_home}/libexec/zmmailboxdmgr stop ${zimbra_home}/libexec/zmmailboxdmgr stop
if [ $? = 0 ]; then if [ $? = 0 ]; then
echo "done." echo "done."
else else
...@@ -142,7 +142,7 @@ case "$1" in ...@@ -142,7 +142,7 @@ case "$1" in
'status') 'status')
echo -n "mailboxd is " echo -n "mailboxd is "
sudo ${zimbra_home}/libexec/zmmailboxdmgr status ${zimbra_home}/libexec/zmmailboxdmgr status
if [ $? = 0 ]; then if [ $? = 0 ]; then
echo "running." echo "running."
exit 0 exit 0
......
...@@ -14,12 +14,11 @@ ...@@ -14,12 +14,11 @@
# ***** END LICENSE BLOCK ***** # ***** END LICENSE BLOCK *****
# #
## XXX SLAPOS user will not be 'zimbra'
# if [ x`whoami` != "xzimbra" ]; then
if [ x`whoami` != "xzimbra" ]; then # echo "$0 must be run as user zimbra"
echo "$0 must be run as user zimbra" # exit 1
exit 1 # fi
fi
source `dirname $0`/zmshutil || exit 1 source `dirname $0`/zmshutil || exit 1
zmsetvars \ zmsetvars \
......
...@@ -23,10 +23,11 @@ our %loaded = (); ...@@ -23,10 +23,11 @@ our %loaded = ();
my $id = getpwuid($<); my $id = getpwuid($<);
chomp $id; chomp $id;
if ($id ne "zimbra") { ## XXX SLAPOS user will not be 'zimbra'
print STDERR "Error: must be run as zimbra user\n"; #if ($id ne "zimbra") {
exit (1); # print STDERR "Error: must be run as zimbra user\n";
} # exit (1);
#}
my ($help, $dryrun, $mode); my ($help, $dryrun, $mode);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment