Commit c60eed25 authored by Maiken's avatar Maiken

Merge branch 'controldirperm' into 'master'

allow control dir to be 755 or 700
removes common block as required

Closes #21

See merge request nordugrid/arc!138
parents f280a14e a15255ed
......@@ -357,8 +357,8 @@ sub confchecktripel($$$) {
elsif ($block eq "arex" and $name eq "controldir") {
if (! -d $value) {
w("$value: control directory ($name) does not exist\n");
} elsif (!permcheck($value,0755,0777)) {
e("$value: directory ($name) should be 755\n");
} elsif (!permcheck($value,0755,0777) and !permcheck($value,0700,0777)) {
e("$value: directory ($name) should be 755 or 700\n");
}
}
......@@ -638,7 +638,7 @@ Return error if the presence of one value implies one of another
sub check_completeness() {
my $config=shift;
my @required=("common", "arex", "cluster", "lrms");
my @required=("arex", "cluster", "lrms");
my ($validparams, $validblocks, $multiple, $novalueparams) = validconfparams();
......
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