X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=update.cgi;h=02d3a5b28b5cb63030937a5a14e28809bef11c4b;hb=eae592f7884ae95cabd41c3984a8672ecae961c2;hp=f0ff1acbdc140248413930ad4837de4efb30c148;hpb=a5c0027c487d7b6e1ed6a82dbe3bbdebbaa51c12;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/update.cgi b/update.cgi
index f0ff1ac..02d3a5b 100755
--- a/update.cgi
+++ b/update.cgi
@@ -13,6 +13,7 @@ use Digest::HMAC_SHA1 qw(hmac_sha1_hex);
 use Util;
 use English;
 use URI::Escape;
+use Crypt::PasswdMD5;
 use Net::LDAP qw(LDAP_SUCCESS LDAP_PROTOCOL_ERROR);
 
 my %config = &Util::ReadConfigFile;
@@ -239,16 +240,16 @@ if (!($query->param('doupdate'))) {
   if ($query->param('newwebpass') && $query->param('newwebpassvrfy')) {
     if ($query->param('newwebpass') ne $query->param('newwebpassvrfy')) {
       # passwords don't match...
-      &Util::HTMLError("The passwords you specified do not match. Please go back and try again.");
+      &Util::HTMLError("The web-passwords you specified do not match. Please go back and try again.");
     }
 
     my ($r, $msg) = &Util::checkPasswordQuality($query->param('newwebpass'), undef, [@ldapinfo_for_pwcheck]);
     if ($r) {
-      &Util::HTMLError("Password check failed: $msg.  Please go back and try again.");
+      &Util::HTMLError("Password check failed for web-password: $msg.  Please go back and try again.");
     }
 
     # create a md5 crypted password
-    $newwebpassword = '{crypt}'.crypt($query->param('newwebpass'), &Util::CreateCryptSalt(1));
+    $newwebpassword = apache_md5_crypt($query->param('newwebpass'), &Util::CreateCryptSalt(2));
     
     &Util::LDAPUpdate($ldap, $editdn, 'webPassword', $newwebpassword);
   }