[pve-devel] r5560 - pve-access-control/trunk/PVE

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-02-18 06:26:22 +0100 (Fri, 18 Feb 2011)
New Revision: 5560

Modified:
   pve-access-control/trunk/PVE/AccessControl.pm
Log:
re-enable ldaps


Modified: pve-access-control/trunk/PVE/AccessControl.pm
===================================================================
--- pve-access-control/trunk/PVE/AccessControl.pm	2011-02-17 13:15:02 UTC (rev 5559)
+++ pve-access-control/trunk/PVE/AccessControl.pm	2011-02-18 05:26:22 UTC (rev 5560)
@@ -486,6 +486,7 @@
 	comment => '.*',
     }
 };
+$valid_attributes->{ldaps} = $valid_attributes->{ldap};
 
 sub add_role_privs {
     my ($role, $usercfg, $privs) = @_;
@@ -836,12 +837,13 @@
 	    my $ignore = 0;
 	    my $entry;
 
-	    if (!PVE::JSONSchema::pve_verify_configid($domid, 1)) {
+	    my $formats = $valid_attributes->{$type};
+	    if (!$formats) {
 		$ignore = 1;
+		warn "ignoring domain '$domid' - (unsupported authentication type '$type')\n";
+	    } elsif (!PVE::JSONSchema::pve_verify_configid($domid, 1)) {
+		$ignore = 1;
 		warn "ignoring domain '$domid' - (illegal characters)\n";
-	    } elsif (($type ne "ad") && ($type ne "ldap") && ($type ne "ldaps")) {
-		$ignore = 1;
-		warn "ignoring domain '$domid' - (unsupported authentication type '$type')\n";
 	    } else {
 		$entry = { type => $type };
 	    }
@@ -854,8 +856,6 @@
 		    
 		next if $ignore; # skip
 
-		my $formats = $valid_attributes->{$entry->{type}};
-
 		if ($line =~ m/^\s+(\S+)(\s+(.*\S))?\s*$/) {
 		    my ($k, $v) = (lc($1), $3);
 		    if ($formats->{$k}) {