Skip to content

Solaris linux.symlinks #1517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Solaris linux.symlinks #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f58c4c
CPU limit starts counting with reception of the first command.
Sashan Aug 16, 2022
958c041
Solaris symlinks have same attributes as linux symlinks
Sashan Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tests/t/lib/ProFTPD/Tests/Config/RLimitCPU.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ sub rlimitcpu_session_min {
defined(my $pid = fork()) or die("Can't fork: $!");
if ($pid) {
eval {
eval { ProFTPD::TestSuite::FTP->new('127.0.0.1', $port, 0, 1) };
my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port, 0, 2, 2);
eval { $client->login($user, $passwd); };
unless ($@) {
die("Connecting to server succeeded unexpectedly");
}
Expand Down
6 changes: 3 additions & 3 deletions tests/t/lib/ProFTPD/Tests/Config/ShowSymlinks.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ sub showsymlinks_on_list_rel_symlinked_file {

# Different platforms' Perl create symlinks with different perms
my $expected_perms = 'lrwxr-xr-x';
if ($^O eq 'linux') {
if ($^O eq 'linux' or $^O eq 'solaris') {
$expected_perms = 'lrwxrwxrwx';
}

Expand Down Expand Up @@ -826,7 +826,7 @@ sub showsymlinks_on_list_rel_symlinked_dir {

# Different platforms' Perl create symlinks with different perms
my $expected_perms = 'lrwxr-xr-x';
if ($^O eq 'linux') {
if ($^O eq 'linux' or $^O eq 'solaris') {
$expected_perms = 'lrwxrwxrwx';
}

Expand Down Expand Up @@ -3732,7 +3732,7 @@ sub showsymlinks_on_stat_rel_symlinked_file {
$expected = 'lrwxr-xr-x';

# Different platforms' Perl create symlinks with different perms
if ($^O eq 'linux') {
if ($^O eq 'linux' or $^O eq 'solaris') {
$expected = 'lrwxrwxrwx';
}

Expand Down