s3-privs Hide the bitmap-based grant_privilege and revoke_privilege

[samba.git] / source3 / utils / net_sam.c

diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 53e8c96f63a367a258995b0209c8ed80465ded5c..a5be7146311bc73b92cba40d8609b881b8f76847 100644 (file)
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -692,7 +692,6 @@ static int net_sam_rights_grant(struct net_context *c, int argc,
        struct dom_sid sid;
        enum lsa_SidType type;
        const char *dom, *name;
-       uint64_t mask;
        int i;
 
        if (argc < 2 || c->display_usage) {
@@ -709,12 +708,13 @@ static int net_sam_rights_grant(struct net_context *c, int argc,
        }
 
        for (i=1; i < argc; i++) {
-               if (!se_priv_from_name(argv[i], &mask)) {
+               enum sec_privilege privilege = sec_privilege_id(argv[i]);
+               if (privilege == SEC_PRIV_INVALID) {
                        d_fprintf(stderr, _("%s unknown\n"), argv[i]);
                        return -1;
                }
 
-               if (!grant_privilege(&sid, mask)) {
+               if (!grant_privilege_by_name(&sid, argv[i])) {
                        d_fprintf(stderr, _("Could not grant privilege\n"));
                        return -1;
                }
@@ -731,7 +731,6 @@ static int net_sam_rights_revoke(struct net_context *c, int argc,
        struct dom_sid sid;
        enum lsa_SidType type;
        const char *dom, *name;
-       uint64_t mask;
        int i;
 
        if (argc < 2 || c->display_usage) {
@@ -748,13 +747,13 @@ static int net_sam_rights_revoke(struct net_context *c, int argc,
        }
 
        for (i=1; i < argc; i++) {
-
-               if (!se_priv_from_name(argv[i], &mask)) {
+               enum sec_privilege privilege = sec_privilege_id(argv[i]);
+               if (privilege == SEC_PRIV_INVALID) {
                        d_fprintf(stderr, _("%s unknown\n"), argv[i]);
                        return -1;
                }
 
-               if (!revoke_privilege(&sid, mask)) {
+               if (!revoke_privilege_by_name(&sid, argv[i])) {
                        d_fprintf(stderr, _("Could not revoke privilege\n"));
                        return -1;
                }