From a314b1fd3145dfc35bee2586fdfa19929f2a3353 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 23 Mar 2009 10:22:06 +0000
Subject: - fix 14 other #37452-like crashes in Apache, DHCP, DNS client, NTP, 
  proftpd, PXE, squid & SSH wizards

---
 client_wizard/Bind_client.pm | 1 -
 dhcp_wizard/Dhcp.pm          | 3 +--
 ftp_wizard/Proftpd.pm        | 2 --
 proxy_wizard/Squid.pm        | 2 --
 pxe_wizard/Pxe.pm            | 2 --
 sshd_wizard/Sshd.pm          | 2 --
 time_wizard/Ntp.pm           | 1 -
 web_wizard/Apache.pm         | 2 --
 8 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/client_wizard/Bind_client.pm b/client_wizard/Bind_client.pm
index b70e00eb..396260e2 100755
--- a/client_wizard/Bind_client.pm
+++ b/client_wizard/Bind_client.pm
@@ -96,7 +96,6 @@ $o->{pages} = {
 	      end => { 
 	        name => N("Congratulations") . "\n\n" . N("The wizard successfully added the client."),
 		end => 1,
-	        next => 0
 	  },
 };
 
diff --git a/dhcp_wizard/Dhcp.pm b/dhcp_wizard/Dhcp.pm
index 658103a5..2f7b4c46 100755
--- a/dhcp_wizard/Dhcp.pm
+++ b/dhcp_wizard/Dhcp.pm
@@ -127,14 +127,13 @@ $o->{pages} = {
 	       end => {
 		       name => N("Congratulations") . "\n\n" . N("The wizard successfully configured the DHCP services."),
 		       end => 1,
-		       next => 0, no_back => 1,
+		       no_back => 1,
 		      },
 	       error_end => {
 			     name => N("Failed"),
                              data => [ { label => N("Relaunch drakwizard, and try to change some parameters.") } ],
                              no_back => 1,
                              end => 1,
-                             next => 0,
                             },
 	      };
 
diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index 7fdff7b2..7af7bbe6 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -168,14 +168,12 @@ $o->{pages} = {
 		       name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your intranet/Internet FTP server"),
 		       end => 1,
 		       no_back => 1,
-		       next => 0
 		      },
 	       error_end => {
 			     name => N("Failed"),
                              data => [ { label => N("Please relaunch drakwizard, and try to change some parameters.") } ],
                              no_back => 1,
                              end => 1,
-                             next => 0,
                             },
 };
 
diff --git a/proxy_wizard/Squid.pm b/proxy_wizard/Squid.pm
index 1188ddcc..9f15461e 100755
--- a/proxy_wizard/Squid.pm
+++ b/proxy_wizard/Squid.pm
@@ -184,14 +184,12 @@ $o->{pages} = {
 	      end => { 
 	        name => N("Congratulations") . N("The wizard has successfully configured your proxy server."), 
 		end => 1,
-	        next => 0
 		     },
 	       error_end => {
 			     name => N("Failed"),
                              data => [ { label => N("Relaunch drakwizard, and try to change some parameters.") } ],
                              no_back => 1,
                              end => 1,
-                             next => 0,
                             },
 
 };
diff --git a/pxe_wizard/Pxe.pm b/pxe_wizard/Pxe.pm
index 36d1f80b..f337abe7 100644
--- a/pxe_wizard/Pxe.pm
+++ b/pxe_wizard/Pxe.pm
@@ -325,14 +325,12 @@ $o->{pages} = {
 			     data => [ { label => N("The wizard successfully configured your PXE server.") } ],
                              no_back => 1,
                              end => 1,
-                             next => 0
 			    },
 	       error_end => {
 			     name => N("Failed"),
                              data => [ { label => N("Please relaunch drakwizard, and try to change some parameters.") } ],
                              no_back => 1,
                              end => 1,
-                             next => 0,
                             },
 	      };
 
diff --git a/sshd_wizard/Sshd.pm b/sshd_wizard/Sshd.pm
index 50acbe56..3c865522 100755
--- a/sshd_wizard/Sshd.pm
+++ b/sshd_wizard/Sshd.pm
@@ -192,14 +192,12 @@ $o->{pages} = {
                        name => N('Congratulations') . "\n\n" . N('The wizard successfully configured your SSH server.'),
                        no_back => 1,
                        end => 1,
-                       next => 0
                       },
                error_end => {
                              name => N("Failed"),
                              data => [ { label => N("Please relaunch drakwizard, and try to change some parameters.") } ],
                              no_back => 1,
                              end => 1,
-			     next => 0,
                             },
 	       	      };
 
diff --git a/time_wizard/Ntp.pm b/time_wizard/Ntp.pm
index 470bbfe9..0c0a67a4 100644
--- a/time_wizard/Ntp.pm
+++ b/time_wizard/Ntp.pm
@@ -158,7 +158,6 @@ $o->{pages} = {
 	       end => { 
 	        name => N("Time server configuration saved") . "\n\n" . N("Your server can now act as a time server for your local network."), 
 		end => 1,
-	        next => 0,
 		      no_back => 1,
 	  },
 };
diff --git a/web_wizard/Apache.pm b/web_wizard/Apache.pm
index 6e1972ac..088ca66e 100755
--- a/web_wizard/Apache.pm
+++ b/web_wizard/Apache.pm
@@ -148,14 +148,12 @@ $o->{pages} = {
 	       end => {
 		       name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your intranet/Internet Web server"),
 		       end => 1,
-		       next => 0,
 		      },
 	       error_end => {
 			     name => N("Failed"),
 			     data => [ { label => N("Relaunch drakwizard, and try to change some parameters.") } ],
                              no_back => 1,
                              end => 1,
-                             next => 0,
                             },
 	      };
 
-- 
cgit v1.2.1