From 2887c552ced4a547defaeaaec721d9e7591b481d Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 14 Jan 2009 18:56:20 +0000
Subject: [PATCH] Call the error function on failure, instead of trying to
 create our own error page

---
 useradmin/images/smallicon.gif | Bin 0 -> 351 bytes
 useradmin/user-lib.pl          |  17 +++++------------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/useradmin/images/smallicon.gif b/useradmin/images/smallicon.gif
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..00ebb9d8a7d1a8d8ead229e591c0a6d880b82ded 100644
GIT binary patch
literal 351
zcmZ?wbh9u|lwgoxIKlt|GiT21?d>ftF81~HefI2`v9a-)GiMGQIIwKlvWA9+w6wIS
zsHp${|9}4c*}=i#=FOXD&z_Z%lG?m^GgvnPLI)%dvWtQBNrG};O6I%^DM|;5r(M{@
zp_-um-r}V9Plid6>jZ^=RjiU}dB!Y|GP#*qHMvV*KRaXLi+L<fk||#jY(?)H`fP}f
zi=AZPxKNKXXm9o69tDGx%xqq37ZVFcCI)U{0d|34Wr5_DW@Q!uMlNAicEM7WDJpEu
z!d!DEO;AakAHmDTC>+SgH(#mSQ;Exhi!G3qmG{5`E!z|hZ+=b=UUv13yhoK7mT+-1
zo{3Mc;??0TU(dNh?dbV+r;oBT&ptHKCvT$d7Gb6>s!uO0NZ#MvTegFHYsZGkLY(4)
T&Ac)jymu6I9A;BwV6X-N64-Jv

literal 0
HcmV?d00001

diff --git a/useradmin/user-lib.pl b/useradmin/user-lib.pl
index 79f24eb1a..baa142c95 100644
--- a/useradmin/user-lib.pl
+++ b/useradmin/user-lib.pl
@@ -1758,6 +1758,7 @@ elsif ($config{'md5'} == 1 && !$config{'skip_md5'}) {
 	# Up to system
 	$format = &use_md5() if (defined(&use_md5));
 	}
+
 if ($no_encrypt_password) {
 	# Some operating systems don't do any encryption!
 	return $pass;
@@ -1766,13 +1767,9 @@ elsif ($format == 1) {
 	# MD5 encryption is selected .. use it if possible
 	local $err = &check_md5();
 	if ($err) {
-		&ui_print_header(undef, $text{'error'}, "");
-		print &text('usave_edigestmd5',
+		&error(&text('usave_edigestmd5',
 		    "/config.cgi?$module_name",
-		    "/cpan/download.cgi?source=3&cpan=$err", $err),
-		    "<p>\n";
-		&ui_print_footer("", $text{'index_return'});
-		exit;
+		    "/cpan/download.cgi?source=3&cpan=$err", $err));
 		}
 	return &encrypt_md5($pass, $salt);
 	}
@@ -1780,13 +1777,9 @@ elsif ($format == 2) {
 	# Blowfish is selected .. use it if possible
 	local $err = &check_blowfish();
 	if ($err) {
-		&ui_print_header(undef, $text{'error'}, "");
-		print &text('usave_edigestblowfish',
+		&error(&text('usave_edigestblowfish',
 		    "/config.cgi?$module_name",
-		    "/cpan/download.cgi?source=3&cpan=$err", $err),
-		    "<p>\n";
-		&ui_print_footer("", $text{'index_return'});
-		exit;
+		    "/cpan/download.cgi?source=3&cpan=$err", $err));
 		}
 	return &encrypt_blowfish($pass, $salt);
 	}