Add support for options in keyfile

The sshd file format has optional options; copy them to a
placeholder node and generate to authorized_keys

Better error message when wrong number of arguments.

1 files changed, 3 insertions, 0 deletions

diff --git a/lib/Vyatta/Login/User.pm b/lib/Vyatta/Login/User.pm
index e6632194..e08a65b9 100755
--- a/lib/Vyatta/Login/User.pm
+++ b/lib/Vyatta/Login/User.pm
@@ -88,8 +88,11 @@ sub _authorized_keys {
     print {$auth} "# Automatically generated by Vyatta configuration\n";
     print {$auth} "# Do not edit, all changes will be lost\n";
     foreach my $name (@keys) {
+	my $options = $config->returnValue("$name options");
         my $type = $config->returnValue("$name type");
         my $key  = $config->returnValue("$name key");
+
+	print {$auth} "$options " if $options;
         print {$auth} "$type $key $name\n";
     }