preserve authorized_key key order

And identify double keys by key and not by comment. Original patch from Stefan Priebe <s.priebe@profihost.ag> contains white space errors - I removed that.

diff --git a/data/PVE/Cluster.pm b/data/PVE/Cluster.pm
index a877d41115358e9d9244fe6dbe40852a7cc66d08..cd9d192499c56013d563e792ee5aac2e808c4d7c 100644 (file)
--- a/data/PVE/Cluster.pm
+++ b/data/PVE/Cluster.pm
@@ -1015,16 +1015,14 @@ sub ssh_merge_keys {
 
     my $newdata = "";
     my $vhash = {};
-    while ($data && $data =~ s/^((.*?)(\n|$))//) {
-       my $line = "$2\n";
-       if ($line =~ m/^ssh-rsa\s+\S+\s+(\S+)$/) {
-           $vhash->{$1} = $line;
-       } else {
-           $newdata .= $line;
+    my @lines = split(/\n/, $data);
+    foreach my $line (@lines) {
+       if ($line =~ m/^ssh-rsa\s+(\S+)\s+\S+$/) {
+            next if $vhash->{$1};
+            $vhash->{$1} = 1;
        }
+       $newdata .= "$line\n";
     }
-    
-    $newdata .= join("", values(%$vhash));
 
     PVE::Tools::file_set_contents($sshauthkeys, $newdata, 0600);
 }