Attachment 4344 Details for Bug 11134 – fix typo

[patch] fix typo

drakwizard-sshd.patch (text/plain), 1.43 KB, created by Derek Jennings on 2013-09-10 16:38:17 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Jennings

Created: 2013-09-10 16:38:17 CEST

Size: 1.43 KB

patch

obsolete

>--- Sshd.pm
>+++ Sshd.pm
>@@ -33,26 +33,26 @@ my $wiz = new MDK::Wizard::Wizcommon;
> my $in = interactive->vnew;
> my $conf = "/etc/ssh/sshd_config";
> #my $SHORTHOSTNAME = chomp_(`hostname -s`);
>-
>-# we ask glueconf to give us the structure representing /etc/ssh/sshd_config
>-my $sshd = new Libconf::Glueconf::Networking::Sshd_config({ filename => '/etc/ssh/sshd_config' });
>-
>-# ------ debug
>-use Data::Dumper;
>-print Dumper($sshd);
>+my $sshd;
> 
> my $o = {
>          name => 'SSH wizard',
>          var => {
>                 wiz_port => '',
>                },
>-#       init => sub {
>-#         my ($err, $msg) = test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
>-#         if (!$err) {
>-#           $in->ask_warn(N('Error'), $msg);
>-#           die 'wizcancel';
>-#         }
>-#         },
>+        init => sub {
>+               if (-f $conf) {
>+                       # we ask glueconf to give us the structure representing /etc/ssh/sshd_config
>+                       $sshd = new Libconf::Glueconf::Networking::Sshd_config({ filename => '/etc/ssh/sshd_config' });
>+
>+                       # ------ debug
>+                       use Data::Dumper;
>+                       print Dumper($sshd);
>+               } else {
>+                       return 0, N("%s does not exist.", $conf);
>+               }
>+               1;
>+         },
>          needed_rpm => [ 'openssh-server' ],
>          defaultimage => "/usr/share/wizards/sshd_wizard/images/IC-Dssh-48.png",
>        };

--- Sshd.pm
+++ Sshd.pm
@@ -33,26 +33,26 @@ my $wiz = new MDK::Wizard::Wizcommon;
 my $in = interactive->vnew;
 my $conf = "/etc/ssh/sshd_config";
 #my $SHORTHOSTNAME = chomp_(`hostname -s`);
-
-# we ask glueconf to give us the structure representing /etc/ssh/sshd_config
-my $sshd = new Libconf::Glueconf::Networking::Sshd_config({ filename => '/etc/ssh/sshd_config' });
-
-# ------ debug
-use Data::Dumper;
-print Dumper($sshd);
+my $sshd;
 
 my $o = {
          name => 'SSH wizard',
          var => {
                 wiz_port => '',
                },
-#       init => sub {
-#         my ($err, $msg) = test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
-#         if (!$err) {
-#           $in->ask_warn(N('Error'), $msg);
-#           die 'wizcancel';
-#         }
-#         },
+        init => sub {
+               if (-f $conf) {
+                       # we ask glueconf to give us the structure representing /etc/ssh/sshd_config
+                       $sshd = new Libconf::Glueconf::Networking::Sshd_config({ filename => '/etc/ssh/sshd_config' });
+
+                       # ------ debug
+                       use Data::Dumper;
+                       print Dumper($sshd);
+               } else {
+                       return 0, N("%s does not exist.", $conf);
+               }
+               1;
+         },
          needed_rpm => [ 'openssh-server' ],
          defaultimage => "/usr/share/wizards/sshd_wizard/images/IC-Dssh-48.png",
        };

Actions: View | Diff

Attachments on bug 11134: 4341 | 4342 | 4343 | 4344