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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-08-13 09:07:12 +0000 (Fri, 13 Aug 2010)
New Revision: 4999

Modified:
   pve-access-control/trunk/ACL.pm
   pve-access-control/trunk/Group.pm
Log:


Modified: pve-access-control/trunk/ACL.pm
===================================================================
--- pve-access-control/trunk/ACL.pm	2010-08-13 09:05:45 UTC (rev 4998)
+++ pve-access-control/trunk/ACL.pm	2010-08-13 09:07:12 UTC (rev 4999)
@@ -46,7 +46,7 @@
 	properties => {
 	    path => { type => 'string' },
 	    uglist => { type => 'string' },
-	    roles => { type => 'string' },
+	    roles => { type => 'string', format => 'pve-roleid-list' },
 	    propagate => { type => 'boolean', optional => 1 },
 	    delete => { type => 'boolean', optional => 1 },
 	},
@@ -67,7 +67,6 @@
 		die "invalid ACL path '$param->{path}'\n" if !$path;
 
 		foreach my $role (split_list($param->{roles})) {
-		    PVE::AccessControl::verify_rolename($role);
 		    die "role '$role' does not exist\n" 
 			if !$cfg->{roles}->{$role};
 

Modified: pve-access-control/trunk/Group.pm
===================================================================
--- pve-access-control/trunk/Group.pm	2010-08-13 09:05:45 UTC (rev 4998)
+++ pve-access-control/trunk/Group.pm	2010-08-13 09:07:12 UTC (rev 4999)
@@ -94,7 +94,7 @@
     parameters => {
    	additionalProperties => 0,
 	properties => {
-	    groupid => { type => 'string', format => 'pve-groupid'},
+	    groupid => { type => 'string', format => 'pve-groupid' },
 	},
     },
     returns => {},
@@ -122,7 +122,7 @@
     parameters => {
    	additionalProperties => 0,
 	properties => {
-	    groupid => { type => 'string' },
+	    groupid => { type => 'string' , format => 'pve-groupid' },
 	}
     },
     returns => { type => 'null' },
@@ -136,8 +136,6 @@
 
 		my $group = $param->{groupid};
 
-		PVE::AccessControl::verify_groupname($group);
-
 		die "group '$group' does not exist\n" 
 		    if $usercfg->{groups}->{$group};