summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jennings <djennings@mageia.org>2013-09-10 16:02:39 +0100
committerDerek Jennings <djennings@mageia.org>2013-09-10 16:02:39 +0100
commitc0adff0dfecd716abb2670ef732e51655127cded (patch)
tree552bc8d780e3ec24368a4b7a1bb17219121e9539
parent7dda0f76c3c052250507155511c31cb56aefad55 (diff)
downloaddrakwizard-c0adff0dfecd716abb2670ef732e51655127cded.tar
drakwizard-c0adff0dfecd716abb2670ef732e51655127cded.tar.gz
drakwizard-c0adff0dfecd716abb2670ef732e51655127cded.tar.bz2
drakwizard-c0adff0dfecd716abb2670ef732e51655127cded.tar.xz
drakwizard-c0adff0dfecd716abb2670ef732e51655127cded.zip
add DSAAuthentication option to sshd wizard
-rw-r--r--NEWS1
-rwxr-xr-xsshd_wizard/Sshd.pm3
2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 73b5d927..4ee9f368 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- add option for DSAAuthentication to sshd wizard
- ensure sshd config is read after package installed (mga#11134)
- fix detection of invalid domain names
diff --git a/sshd_wizard/Sshd.pm b/sshd_wizard/Sshd.pm
index 2eab1959..239c1db3 100755
--- a/sshd_wizard/Sshd.pm
+++ b/sshd_wizard/Sshd.pm
@@ -105,6 +105,7 @@ $o->{pages} = {
auth_options => {
name => N("Authentication Method"),
pre => sub {
+ $o->{var}{DSAAuthentication} ||= $sshd->{DSAAuthentication};
$o->{var}{RSAAuthentication} ||= $sshd->{RSAAuthentication};
$o->{var}{PubkeyAuthentication} ||= $sshd->{PubkeyAuthentication};
$o->{var}{AuthorizedKeysFile} = $sshd->{AuthorizedKeysFile} || ".ssh/authorized_keys2";
@@ -113,6 +114,7 @@ $o->{pages} = {
$o->{var}{PermitEmptyPasswords} ||= $sshd->{PermitEmptyPasswords};
},
data => [
+ { label => N("DSA auth:"), val => \$o->{var}{DSAAuthentication}, list_ref => \@yesorno },
{ label => N("RSA auth:"), val => \$o->{var}{RSAAuthentication}, list_ref => \@yesorno },
{ label => N("PubKey auth:"), val => \$o->{var}{PubkeyAuthentication}, list_ref => \@yesorno },
{ label => N("Auth key file:"), val => \$o->{var}{AuthorizedKeysFile} },
@@ -235,6 +237,7 @@ sub global_config {
$o->{var}{PrintMotd} and $sshd->{PrintMotd} = $o->{var}{PrintMotd};
$o->{var}{PrintLastLog} and $sshd->{PrintLastLog} = $o->{var}{PrintLastLog};
+ $o->{var}{DSAAuthentication} and $sshd->{DSAAuthentication} = $o->{var}{DSAAuthentication};
$o->{var}{RSAAuthentication} and $sshd->{RSAAuthentication} = $o->{var}{RSAAuthentication};
$o->{var}{PubkeyAuthentication} and $sshd->{PubkeyAuthentication} = $o->{var}{PubkeyAuthentication};
$o->{var}{AuthorizedKeysFile} and $sshd->{AuthorizedKeysFile} = $o->{var}{AuthorizedKeysFile};