zmamavisdctl, zmclamdctl, zmopendkimctl, zmsaslauthdctl,

  zmfreshclamctl, zmnginxctl, zmtrainsa, zmauditswatchctl,
  zmhactl, zmmemcachedctl, zmswatchctl, zmjsprecompile,
  zmloggerinit, zmresetmysqlpassword, zmupdatezco, zmcbpolicydctl: removed hardcoded checks for zimbra user
zmopendkimctl: do not attemp to switch to zimbra user

ZimbraCBPolicyd/src/bin/zmcbpolicydctl

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-  echo Error: must be run as zimbra user
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#  echo Error: must be run as zimbra user
+#  exit 1
+#fi
 
 source `dirname $0`/zmshutil || exit 1
 zmsetvars \

ZimbraServer/src/bin/zmamavisdctl

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-  echo Error: must be run as zimbra user
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#  echo Error: must be run as zimbra user
+#  exit 1
+#fi
 
 if [ ! -L "/opt/zimbra/amavisd" ]; then
   exit 0

ZimbraServer/src/bin/zmauditswatchctl

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-    echo Error: must be run as zimbra user
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#    echo Error: must be run as zimbra user
+#  exit 1
+#fi
 
 source `dirname $0`/zmshutil || exit 1
 zmsetvars \

ZimbraServer/src/bin/zmclamdctl

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-  echo Error: must be run as zimbra user
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#  echo Error: must be run as zimbra user
+#  exit 1
+#fi
 
 if [ ! -L "/opt/zimbra/clamav" ]; then
   exit 0

ZimbraServer/src/bin/zmfreshclamctl

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-  echo Error: must be run as zimbra user
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#  echo Error: must be run as zimbra user
+#  exit 1
+#fi
 
 if [ ! -L "/opt/zimbra/clamav" ]; then
   exit 0

ZimbraServer/src/bin/zmhactl

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-  echo Error: must be run as zimbra user
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#  echo Error: must be run as zimbra user
+#  exit 1
+#fi
 
 platform=`/opt/zimbra/libexec/get_plat_tag.sh`
 

ZimbraServer/src/bin/zmmemcachedctl

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-    echo Error: must be run as zimbra user
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#    echo Error: must be run as zimbra user
+#  exit 1
+#fi
 
 source `dirname $0`/zmshutil || exit 1
 zmsetvars \

ZimbraServer/src/bin/zmnginxctl

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-    echo "Error: must be run as zimbra user"
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#    echo "Error: must be run as zimbra user"
+#  exit 1
+#fi
 
 source `dirname $0`/zmshutil || exit 1
 zmsetvars \

ZimbraServer/src/bin/zmopendkimctl

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-  echo Error: must be run as zimbra user
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#  echo Error: must be run as zimbra user
+#  exit 1
+#fi
 
 if [ ! -L "/opt/zimbra/opendkim" ]; then
   exit 0
@@ -68,7 +69,7 @@ start()
           if [ x$1 = "x" ]; then
             rewriteconfig
           fi
-          $odk -x $config -u zimbra
+          $odk -x $config
           if [ $? != 0 ]; then
             echo "Failed to start opendkim: $?"
             exit 1

ZimbraServer/src/bin/zmsaslauthdctl

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-    echo Error: must be run as zimbra user
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#    echo Error: must be run as zimbra user
+#  exit 1
+#fi
 
 
 source `dirname $0`/zmshutil || exit 1

ZimbraServer/src/bin/zmswatchctl

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-    echo Error: must be run as zimbra user
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#    echo Error: must be run as zimbra user
+#  exit 1
+#fi
 
 source `dirname $0`/zmshutil || exit 1
 zmsetvars \

ZimbraServer/src/bin/zmtrainsa

@@ -104,10 +104,11 @@ usage() {
   exit 1
 }
 
-if [ x`whoami` != xzimbra ]; then
-    echo Error: must be run as zimbra user
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#    echo Error: must be run as zimbra user
+#  exit 1
+#fi
 
 if [ ! -h "/opt/zimbra/amavisd" ]; then
     echo "Error: SpamAssassin not installed"

ZimbraServer/src/libexec/zmjsprecompile

@@ -14,10 +14,11 @@
 #; ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-    echo Error: must be run as zimbra user
-    exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#    echo Error: must be run as zimbra user
+#    exit 1
+#fi
 
 zimbra_home=/opt/zimbra
 zimbra_java_home=${zimbra_home}/java

ZimbraServer/src/libexec/zmloggerinit

@@ -14,11 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-#
-if [ x`whoami` != "xzimbra" ]; then
-  echo "Error: must be run as user zimbra"
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != "xzimbra" ]; then
+#  echo "Error: must be run as user zimbra"
+#  exit 1
+#fi
 
 umask 027
 source `dirname $0`/../bin/zmshutil || exit 1

ZimbraServer/src/libexec/zmresetmysqlpassword

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != "xzimbra" ]; then
-  echo "Error: must be run as user zimbra"
-  exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != "xzimbra" ]; then
+#  echo "Error: must be run as user zimbra"
+#  exit 1
+#fi
 
 usage() {
   echo "$0 [--help] [--sql_root_pw <password>] [--mysql_memory_percent 30]"

ZimbraServer/src/libexec/zmupdatezco

@@ -14,10 +14,11 @@
 # ***** END LICENSE BLOCK *****
 # 
 
-if [ x`whoami` != xzimbra ]; then
-    echo Error: must be run as zimbra user
-    exit 1
-fi
+# XXX SLAPOS must run as current user
+#if [ x`whoami` != xzimbra ]; then
+#    echo Error: must be run as zimbra user
+#    exit 1
+#fi
 
 source `dirname $0`/../bin/zmshutil || exit 1
 zmsetvars