X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=blobdiff_plain;f=update.cgi;h=5a59a3436be62c5bf7605b42668c977bab6ca954;hp=d7749d89d75e1876428ae77254124da8e8d84be4;hb=315098762d694e291a67049a1f7fe73b929ed64b;hpb=9b394648f35965c5b6e18a8ff12af25d73866f7a

diff --git a/update.cgi b/update.cgi
index d7749d8..5a59a34 100755
--- a/update.cgi
+++ b/update.cgi
@@ -42,7 +42,7 @@ sub DieHandler {
   $ldap->unbind if (defined($ldap));
 }
 
-$SIG{__DIE__} = \&DieHandler;
+#$SIG{__DIE__} = \&DieHandler;
 
 $ldap = Net::LDAP->new($config{ldaphost});
 &Util::UpgradeConnection($ldap) unless $config{usessl} eq 'False';
@@ -240,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 = apache_md5_crypt($query->param('newwebpass'), &Util::CreateMD5Salt());
+    $newwebpassword = apache_md5_crypt($query->param('newwebpass'), &Util::CreateCryptSalt(1, 1));
     
     &Util::LDAPUpdate($ldap, $editdn, 'webPassword', $newwebpassword);
   }