X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=update.cgi;h=ddb8052be31984a74df35d58128d01b357e2fc4f;hb=97656e96ad0f176861c10229e1560a5d6799d032;hp=f1f82f9e81ae38e8d62fd6bfa6fdd3246fdbb654;hpb=8f5508b9c16b83dd323f0bf8eabdfd67b979eb0e;p=mirror%2Fuserdir-ldap-cgi.git diff --git a/update.cgi b/update.cgi index f1f82f9..ddb8052 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'; @@ -144,7 +146,7 @@ if (!($query->param('doupdate'))) { my $confirmstring = ''; my $sudopassword = ''; for my $e(@{$entry->{'sudopassword'}}) { - my ($uuid, $status, $hosts, $crypted) = ($e =~ /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}) (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$/); + my ($uuid, $status, $hosts, $crypted) = ($e =~ /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}) (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*-]+) ([^ ]+)$/); unless (defined $uuid) { $sudopassword .= "