ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove extra braces, explicilty handle INHERIT permission and log any other values as a warning

pull/3646/head
Isaac Connor 2022-12-02 14:51:53 -05:00
parent beedb4e36f
commit 0c41333976
1 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/zm_user.cpp
View File

@ -84,25 +84,20 @@ bool User::canAccess(int monitor_id) {
auto permission = it->second.getPermission();
switch (permission) {
case Monitor_Permission::PERM_NONE :
{
Debug(1, "Returning None from monitor_permission");
return false;
}
Debug(1, "Returning None from monitor_permission");
return false;
case Monitor_Permission::PERM_VIEW :
{
Debug(1, "Returning true because VIEW from monitor_permission");
return true;
}
Debug(1, "Returning true because VIEW from monitor_permission");
return true;
case Monitor_Permission::PERM_EDIT :
{
Debug(1, "Returning true because EDIT from monitor_permission");
return true;
}
Debug(1, "Returning true because EDIT from monitor_permission");
return true;
case Monitor_Permission::PERM_INHERIT :
Debug(1, "INHERIT from monitor_permission");
break;
default:
{
Debug(1, "INHERIT from monitor_permission");
break;
}
Warning("UNKNOWN permission %d from monitor_permission", permission);
break;
}
}
@ -112,25 +107,20 @@ bool User::canAccess(int monitor_id) {
auto permission = gp.getPermission(monitor_id);
switch (permission) {
case Group_Permission::PERM_NONE :
{
Debug(1, "Returning None from group_permission");
return false;
}
Debug(1, "Returning None from group_permission");
return false;
case Group_Permission::PERM_VIEW :
{
Debug(1, "Returning true because VIEW from group_permission");
return true;
}
Debug(1, "Returning true because VIEW from group_permission");
return true;
case Group_Permission::PERM_EDIT :
{
Debug(1, "Returning true because EDIT from group_permission");
return true;
}
Debug(1, "Returning true because EDIT from group_permission");
return true;
case Group_Permission::PERM_INHERIT :
Debug(1, "INHERIT from group_permission %d", gp.GroupId());
break;
default :
{
Debug(1, "INHERIT from group_permission %d", gp.GroupId());
break;
}
Warning("UNKNOWN permission %d from group_permission %d", permission, gp.GroupId());
break;
}
} // end foreach Group_Permission