From b649f3b40ea7cc4538514f5f84d7b2f7bc22e1fb Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 11 Nov 2021 12:06:42 +0100 Subject: [PATCH] tfa: upgrade check: more info in error message(s) Signed-off-by: Thomas Lamprecht --- src/PVE/AccessControl.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm index c5be63b..33cf6f5 100644 --- a/src/PVE/AccessControl.pm +++ b/src/PVE/AccessControl.pm @@ -1774,22 +1774,22 @@ sub assert_new_tfa_config_available() { foreach my $node (keys $members->%*) { my $info = $version_info->{$node}; if (!$info) { - $old .= "cluster node '$node' is too old, did not broadcast its version info\n"; + $old .= " cluster node '$node' is too old, did not broadcast its version info\n"; next; } $info = from_json($info); my $ver = $info->{version}; if ($ver !~ /^(\d+\.\d+)-(\d+)/) { - $old .= "cluster node '$node' provided an invalid version string: '$ver'\n"; + $old .= " cluster node '$node' provided an invalid version string: '$ver'\n"; next; } my ($maj, $rel) = ($1, $2); if (!($maj > 7.0 || ($maj == 7.0 && $rel >= 15))) { - $old .= "cluster node '$node' is too old\n"; + $old .= " cluster node '$node' is too old ($ver < 7.0-15)\n"; next; } } - die $old if length($old); + die "cannot update tfa config, following nodes are not up to date:\n$old" if length($old); } sub user_remove_tfa : prototype($) { -- 2.39.2