Commit 64deac63 authored by Marco Mariani's avatar Marco Mariani

disabled 'su' and root checks in zmsetup.pl and zmupgrade

parent b4f455d6
......@@ -45,9 +45,13 @@ progress("Operations logged to $logfile\n");
our $ZMPROV = "/opt/zimbra/bin/zmprov -r -m -l";
our $SU;
if ($platform =~ /MACOSXx86_10/) {
$SU = "su - zimbra -c -l ";
# XXX SLAPOS must run as current user
#$SU = "su - zimbra -c -l ";
$SU = "bash -c ";
} else {
$SU = "su - zimbra -c ";
# XXX SLAPOS must run as current user
#$SU = "su - zimbra -c ";
$SU = "bash -c ";
}
if ($platform =~ /MACOSX/ && $platform ne "MACOSXx86_10.6" && $platform ne "MACOSXx86_10.7") {
......@@ -151,7 +155,8 @@ my $ssl_cert_type = "self";
my @interfaces = ();
($>) and usage();
## XXX SLAPOS disable root check
#($>) and usage();
getopts("c:hd", \%options) or usage();
......
......@@ -50,9 +50,13 @@ chomp $platform;
my $addr_space = (($platform =~ m/\w+_(\d+)/) ? "$1" : "32");
my $su;
if ($platform =~ /MACOSXx86_10/) {
$su = "su - zimbra -c -l";
# XXX SLAPOS must run as current user
#$su = "su - zimbra -c -l";
$su = "bash -c ";
} else {
$su = "su - zimbra -c";
# XXX SLAPOS must run as current user
#$su = "su - zimbra -c";
$su = "bash -c ";
}
my $hn = `$su "${zmlocalconfig} -m nokey zimbra_server_hostname"`;
......
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