[pve-devel] r4890 - pve-access-control/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-07-14 07:02:20 +0000 (Wed, 14 Jul 2010)
New Revision: 4890

Modified:
   pve-access-control/trunk/AccessControl.pm
   pve-access-control/trunk/ChangeLog
Log:
	* AccessControl.pm (ldap_bind): correctly raise exception on error


Modified: pve-access-control/trunk/AccessControl.pm
===================================================================
--- pve-access-control/trunk/AccessControl.pm	2010-07-14 05:52:38 UTC (rev 4889)
+++ pve-access-control/trunk/AccessControl.pm	2010-07-14 07:02:20 UTC (rev 4890)
@@ -24,7 +24,9 @@
 my $shadowconfigfile = "shadow.cfg";
 my $shadowconfigpath = "$authdir/$shadowconfigfile";
 my $shadowconfiglock = "$authdir/.lock-$shadowconfigfile";
-my $domainconfigpath = "$authdir/domains.cfg";
+my $domainconfigfile = "domains.cfg";
+my $domainconfigpath = "$authdir/$domainconfigfile";
+my $domainconfiglock = "$authdir/.lock-$domainconfigfile";
 
 my $ticket_lifetime = 3600*2; # 2 hours
 
@@ -503,7 +505,7 @@
 
     my ($server, $type, $username, $password) = @_;
     my $res;
-    my $ldap = Net::LDAP->new($server) or return $@;
+    my $ldap = Net::LDAP->new($server) || die "$@\n";
     if ($type eq "AD") {
 	$res = $ldap->bind( $username, password=>$password );
     } else {

Modified: pve-access-control/trunk/ChangeLog
===================================================================
--- pve-access-control/trunk/ChangeLog	2010-07-14 05:52:38 UTC (rev 4889)
+++ pve-access-control/trunk/ChangeLog	2010-07-14 07:02:20 UTC (rev 4890)
@@ -1,5 +1,7 @@
 2010-07-14  Proxmox Support Team  <support at proxmox.com>
 
+	* AccessControl.pm (ldap_bind): correctly raise exception on error
+
 	* control.in (Depends): add libnet-ldap-perl
 
 2010-07-14  Seth Lauzon <seth.lauzon at gmail.com>A