From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH backup 2/3] acl: use modified constnamedbitmap macro
Date: Tue, 6 Oct 2020 12:08:53 +0200 [thread overview]
Message-ID: <20201006100854.18897-2-t.lamprecht@proxmox.com> (raw)
In-Reply-To: <20201006100854.18897-1-t.lamprecht@proxmox.com>
avoiding the need for reshuffling all bits when a new privilege is
added at the start or in the middle of this definition.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
NOTE: depends on the proxmox crate macro 1/3 patch
src/config/acl.rs | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/config/acl.rs b/src/config/acl.rs
index d31c7a85..67f61976 100644
--- a/src/config/acl.rs
+++ b/src/config/acl.rs
@@ -12,37 +12,37 @@ use ::serde::{Deserialize, Serialize};
use serde::de::{value, IntoDeserializer};
use proxmox::tools::{fs::replace_file, fs::CreateOptions};
-use proxmox::constnamemap;
+use proxmox::constnamedbitmap;
use proxmox::api::{api, schema::*};
use crate::api2::types::Userid;
// define Privilege bitfield
-constnamemap! {
+constnamedbitmap! {
/// Contains a list of Privileges
PRIVILEGES: u64 => {
- PRIV_SYS_AUDIT("Sys.Audit") = 1 << 0;
- PRIV_SYS_MODIFY("Sys.Modify") = 1 << 1;
- PRIV_SYS_POWER_MANAGEMENT("Sys.PowerManagement") = 1 << 2;
+ PRIV_SYS_AUDIT("Sys.Audit");
+ PRIV_SYS_MODIFY("Sys.Modify");
+ PRIV_SYS_POWER_MANAGEMENT("Sys.PowerManagement");
- PRIV_DATASTORE_AUDIT("Datastore.Audit") = 1 << 3;
- PRIV_DATASTORE_MODIFY("Datastore.Modify") = 1 << 4;
- PRIV_DATASTORE_READ("Datastore.Read") = 1 << 5;
+ PRIV_DATASTORE_AUDIT("Datastore.Audit");
+ PRIV_DATASTORE_MODIFY("Datastore.Modify");
+ PRIV_DATASTORE_READ("Datastore.Read");
/// Datastore.Backup also requires backup ownership
- PRIV_DATASTORE_BACKUP("Datastore.Backup") = 1 << 6;
+ PRIV_DATASTORE_BACKUP("Datastore.Backup");
/// Datastore.Prune also requires backup ownership
- PRIV_DATASTORE_PRUNE("Datastore.Prune") = 1 << 7;
+ PRIV_DATASTORE_PRUNE("Datastore.Prune");
- PRIV_PERMISSIONS_MODIFY("Permissions.Modify") = 1 << 8;
+ PRIV_PERMISSIONS_MODIFY("Permissions.Modify");
- PRIV_REMOTE_AUDIT("Remote.Audit") = 1 << 9;
- PRIV_REMOTE_MODIFY("Remote.Modify") = 1 << 10;
- PRIV_REMOTE_READ("Remote.Read") = 1 << 11;
- PRIV_REMOTE_PRUNE("Remote.Prune") = 1 << 12;
+ PRIV_REMOTE_AUDIT("Remote.Audit");
+ PRIV_REMOTE_MODIFY("Remote.Modify");
+ PRIV_REMOTE_READ("Remote.Read");
+ PRIV_REMOTE_PRUNE("Remote.Prune");
- PRIV_SYS_CONSOLE("Sys.Console") = 1 << 13;
+ PRIV_SYS_CONSOLE("Sys.Console");
}
}
next prev parent reply other threads:[~2020-10-06 10:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 10:08 [pbs-devel] [PATCH proxmox 1/3] tools: change constnamemap to a more automatic constnamedbitmap Thomas Lamprecht
2020-10-06 10:08 ` Thomas Lamprecht [this message]
2020-10-06 10:08 ` [pbs-devel] [PATCH backup 3/3] server: add Datastore.Allocate privilege Thomas Lamprecht
2020-10-08 7:12 ` [pbs-devel] applied: [PATCH proxmox 1/3] tools: change constnamemap to a more automatic constnamedbitmap Dietmar Maurer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201006100854.18897-2-t.lamprecht@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.