Skip to content

Commit

Permalink
1.4.6b - updated cipherlist for syncoid to chacha20-poly1305@openssh.…
Browse files Browse the repository at this point in the history
…com,arcfour
  • Loading branch information
jimsalterjrs committed May 27, 2016
1 parent 17759ce commit 6eaa303
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions CHANGELIST
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
1.4.6b updated default cipherlist for syncoid to
[email protected],arcfour - arcfour isn't supported on
newer SSH (in Ubuntu Xenial and FreeBSD), chacha20 isn't supported on
some older SSH versions (Ubuntu Precise< I think?)

1.4.6a due to bug in ZFS on Linux which frequently causes errors to return from `zfs set readonly`,
changed ==0 or die in setzfsvalue() to ==0 or [complain] - it's not worth causing replication
to fail while this ZFS on Linux bug exists.
Expand Down
2 changes: 1 addition & 1 deletion findoid
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use warnings;
my $zfs = '/sbin/zfs';
my %args = getargs(@ARGV);

my $progversion = '1.4.6a';
my $progversion = '1.4.6b';

if ($args{'version'}) { print "$progversion\n"; exit 0; }

Expand Down
2 changes: 1 addition & 1 deletion sanoid
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.

my $version = '1.4.6a';
my $version = '1.4.6b';

use strict;
use Config::IniFiles; # read samba-style conf file
Expand Down
4 changes: 2 additions & 2 deletions syncoid
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.

my $version = '1.4.6a';
my $version = '1.4.6b';

use strict;
use Data::Dumper;
Expand All @@ -25,7 +25,7 @@ my $debug = $args{'debug'};
my $zfscmd = '/sbin/zfs';
my $sshcmd = '/usr/bin/ssh';
my $pscmd = '/bin/ps';
my $sshcipher = '-c arcfour';
my $sshcipher = '-c [email protected],arcfour';
my $pvcmd = '/usr/bin/pv';
my $mbuffercmd = '/usr/bin/mbuffer';
my $sudocmd = '/usr/bin/sudo';
Expand Down

0 comments on commit 6eaa303

Please sign in to comment.