e-smith-base/sme8/e-smith-base-4.18.0-consoleValidateFirst.patch

diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/system_password.pm mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/system_password.pm
--- e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/system_password.pm  2008-01-09 17:32:33.000000000 +1100
+++ mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/system_password.pm        2008-01-09 17:32:18.000000000 +1100
@@ -60,35 +60,6 @@
         goto INITIAL_PASSWORD;
     }
 
-
-    ($rc, $choice2) = $console->password_page
-        (
-         title   => gettext("Choose administrator password"),
-         text    => gettext("Please type your administrator password again to verify."),
-        );
-
-    unless ($rc == 0)
-    {
-        ($rc, $choice) = $console->message_page
-            (
-             title => gettext("Administrator password not set"),
-             text  => gettext("Sorry, you must set the administrator password now."),
-            );
-
-        goto INITIAL_PASSWORD;
-    }
-
-    if ($choice1 ne $choice2)
-    {
-        ($rc, $choice) = $console->message_page
-            (
-             title => gettext("Passwords do not match"),
-             text  => gettext("The two passwords did not match"),
-            );
-
-        goto INITIAL_PASSWORD;
-    }
-
     use Crypt::Cracklib;
 
     #--------------------------------------------------------
@@ -133,6 +104,34 @@
         goto INITIAL_PASSWORD if ($rc == 0);
     }
 
+    ($rc, $choice2) = $console->password_page
+        (
+         title   => gettext("Choose administrator password"),
+         text    => gettext("Please type your administrator password again to verify."),
+        );
+
+    unless ($rc == 0)
+    {
+        ($rc, $choice) = $console->message_page
+            (
+             title => gettext("Administrator password not set"),
+             text  => gettext("Sorry, you must set the administrator password now."),
+            );
+
+        goto INITIAL_PASSWORD;
+    }
+
+    if ($choice1 ne $choice2)
+    {
+        ($rc, $choice) = $console->message_page
+            (
+             title => gettext("Passwords do not match"),
+             text  => gettext("The two passwords did not match"),
+            );
+
+        goto INITIAL_PASSWORD;
+    }
+
     #--------------------------------------------------
     # Set system password
     #--------------------------------------------------
1	bytegw	1.1	diff -Nur -x '.orig' -x '.rej' e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/system_password.pm mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/system_password.pm
2			--- e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/system_password.pm 2008-01-09 17:32:33.000000000 +1100
3			+++ mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/system_password.pm 2008-01-09 17:32:18.000000000 +1100
4			@@ -60,35 +60,6 @@
5			goto INITIAL_PASSWORD;
6			}
7
8			-
9			- ($rc, $choice2) = $console->password_page
10			- (
11			- title => gettext("Choose administrator password"),
12			- text => gettext("Please type your administrator password again to verify."),
13			- );
14			-
15			- unless ($rc == 0)
16			- {
17			- ($rc, $choice) = $console->message_page
18			- (
19			- title => gettext("Administrator password not set"),
20			- text => gettext("Sorry, you must set the administrator password now."),
21			- );
22			-
23			- goto INITIAL_PASSWORD;
24			- }
25			-
26			- if ($choice1 ne $choice2)
27			- {
28			- ($rc, $choice) = $console->message_page
29			- (
30			- title => gettext("Passwords do not match"),
31			- text => gettext("The two passwords did not match"),
32			- );
33			-
34			- goto INITIAL_PASSWORD;
35			- }
36			-
37			use Crypt::Cracklib;
38
39			#--------------------------------------------------------
40			@@ -133,6 +104,34 @@
41			goto INITIAL_PASSWORD if ($rc == 0);
42			}
43
44			+ ($rc, $choice2) = $console->password_page
45			+ (
46			+ title => gettext("Choose administrator password"),
47			+ text => gettext("Please type your administrator password again to verify."),
48			+ );
49			+
50			+ unless ($rc == 0)
51			+ {
52			+ ($rc, $choice) = $console->message_page
53			+ (
54			+ title => gettext("Administrator password not set"),
55			+ text => gettext("Sorry, you must set the administrator password now."),
56			+ );
57			+
58			+ goto INITIAL_PASSWORD;
59			+ }
60			+
61			+ if ($choice1 ne $choice2)
62			+ {
63			+ ($rc, $choice) = $console->message_page
64			+ (
65			+ title => gettext("Passwords do not match"),
66			+ text => gettext("The two passwords did not match"),
67			+ );
68			+
69			+ goto INITIAL_PASSWORD;
70			+ }
71			+
72			#--------------------------------------------------
73			# Set system password
74			#--------------------------------------------------