X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=update.cgi;h=36631697b96dc5b7fa50aef740b57666034fa39e;hb=d7b018a2e8aa309a6fe581c331cbe1d475a3ccef;hp=9f9b78ca557612b350e9f827696d1168100510d4;hpb=6e4d8c65d25e6ef5dc4a92ae8fc917f822d9ebfd;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/update.cgi b/update.cgi
index 9f9b78c..3663169 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';
@@ -207,7 +207,7 @@ if (!($query->param('doupdate'))) {
 
 
   # Actually update stuff...
-  my ($newpassword, $newstaddress, $newwebpassword);
+  my ($newpassword, $newstaddress, $newwebpassword, $newvoippassword);
   
   # Good god, why would we want to do that here?  it breaks password setting
   # etc, and it doesn't prevent people from setting eveil stuff in ldap
@@ -240,19 +240,34 @@ 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::CreateCryptSalt(1));
+    $newwebpassword = apache_md5_crypt($query->param('newwebpass'), &Util::CreateCryptSalt(1, 1));
     
     &Util::LDAPUpdate($ldap, $editdn, 'webPassword', $newwebpassword);
   }  
+  if ($query->param('newvoippass') && $query->param('newvoippassvrfy')) {
+    if ($query->param('newvoippass') ne $query->param('newvoippassvrfy')) {
+      # passwords don't match...
+      &Util::HTMLError("The voip-passwords you specified do not match. Please go back and try again.");
+    }
+
+    my ($r, $msg) = &Util::checkPasswordQuality($query->param('newvoippass'), undef, [@ldapinfo_for_pwcheck]);
+    if ($r) {
+      &Util::HTMLError("Password check failed for voip-password: $msg.  Please go back and try again.");
+    }
+    # create a md5 crypted password
+    $newvoippassword = '{crypt}'.crypt($query->param('newpass'), &Util::CreateCryptSalt(1));
+
+    &Util::LDAPUpdate($ldap, $editdn, 'voipPassword', $newvoippassword);
+  }  
 
   $newstaddress = $query->param('staddress');
   $newstaddress =~ s/\n/\$/m;