X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=update.cgi;h=c4d121de6972a32bf34000584fd3e1be64ba5a00;hb=bb937c32bd6f82064c59c56ef4dc718deb7b581e;hp=f1f82f9e81ae38e8d62fd6bfa6fdd3246fdbb654;hpb=f82558216b5676e2fcc8725b348e1c094b10f151;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/update.cgi b/update.cgi
index f1f82f9..c4d121d 100755
--- a/update.cgi
+++ b/update.cgi
@@ -10,11 +10,13 @@ use strict vars;
 use CGI;
 use Data::UUID;
 use Digest::HMAC_SHA1 qw(hmac_sha1_hex);
+use Digest::MD5 qw(md5_hex);
 use Util;
 use English;
 use URI::Escape;
 use Crypt::PasswdMD5;
 use Net::LDAP qw(LDAP_SUCCESS LDAP_PROTOCOL_ERROR);
+use Net::LDAP::Util qw(ldap_explode_dn);
 
 my %config = &Util::ReadConfigFile;
 
@@ -42,7 +44,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 +209,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
@@ -253,6 +255,21 @@ if (!($query->param('doupdate'))) {
     
     &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 = &md5_hex( ldap_explode_dn($editid)->[0]{UID} . '@debian.org:sip.debian.org:' . $query->param('newvoippass') );
+
+    &Util::LDAPUpdate($ldap, $editdn, 'voipPassword', $newvoippassword);
+  }  
 
   $newstaddress = $query->param('staddress');
   $newstaddress =~ s/\n/\$/m;