From a5dad137cbdff67109fd61b1367ae5f13d531d7a Mon Sep 17 00:00:00 2001
From: Damien Chaumette <dchaumette@mandriva.com>
Date: Tue, 27 Aug 2002 16:58:54 +0000
Subject: *** empty log message ***

---
 perl-install/network/ethernet.pm | 2 +-
 perl-install/network/network.pm  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 8f81e60bc..2411f5cbc 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -209,7 +209,7 @@ such as ``mybox.mylab.myco.com''."),
     } else {
 	configureNetworkNet($in, $netc, $last ||= {}, @l) or goto configureNetwork_step_1;
     }
-    miscellaneousNetwork($in) or goto configureNetwork_step_1;
+    miscellaneousNetwork($in);
 }
 
 1;
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index ddbf45bc3..0cd0189a4 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -392,9 +392,9 @@ sub miscellaneousNetwork {
        complete => sub {
 	   $u->{http_proxy} =~ m,^($|http://), or $in->ask_warn('', _("Proxy should be http://...")), return 1,0;
 	   $u->{ftp_proxy} =~ m,^($|ftp://), or $in->ask_warn('', _("Proxy should be ftp://...")), return 1,1;
-	   return;
+	   0;
        }
-    );
+    ) || return;
 }
 
 sub read_all_conf {
-- 
cgit v1.2.1