From b29b6c13a373c39190db0e2bd0440f7f2619b33c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 27 Aug 2010 10:04:05 +1000 Subject: s3-privs Inline dump_se_priv into callers now that it's just a uint64_t The previous 128 bit structure needed this helper function. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/lib/privileges.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'source3/lib/privileges.c') diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c index 4713bc0700..61425e8272 100644 --- a/source3/lib/privileges.c +++ b/source3/lib/privileges.c @@ -139,8 +139,8 @@ bool get_privileges_for_sids(uint64_t *privileges, struct dom_sid *slist, int sc continue; DEBUG(5,("get_privileges_for_sids: sid = %s\nPrivilege " - "set:\n", sid_string_dbg(&slist[i]))); - dump_se_priv( DBGC_ALL, 5, &mask ); + "set: 0x%llx\n", sid_string_dbg(&slist[i]), + (unsigned long long)mask)); se_priv_add( privileges, &mask ); found = True; @@ -285,11 +285,9 @@ bool grant_privilege(const struct dom_sid *sid, const uint64_t *priv_mask) DEBUG(10,("grant_privilege: %s\n", sid_string_dbg(sid))); - DEBUGADD( 10, ("original privilege mask:\n")); - dump_se_priv( DBGC_ALL, 10, &old_mask ); + DEBUGADD( 10, ("original privilege mask: 0x%llx\n", (unsigned long long)new_mask)); - DEBUGADD( 10, ("new privilege mask:\n")); - dump_se_priv( DBGC_ALL, 10, &new_mask ); + DEBUGADD( 10, ("new privilege mask: 0x%llx\n", (unsigned long long)new_mask)); return set_privileges( sid, &new_mask ); } @@ -326,13 +324,11 @@ bool revoke_privilege(const struct dom_sid *sid, const uint64_t *priv_mask) DEBUG(10,("revoke_privilege: %s\n", sid_string_dbg(sid))); - DEBUGADD( 10, ("original privilege mask:\n")); - dump_se_priv( DBGC_ALL, 10, &mask ); + DEBUGADD( 10, ("original privilege mask: 0x%llx\n", (unsigned long long)mask)); se_priv_remove( &mask, priv_mask ); - DEBUGADD( 10, ("new privilege mask:\n")); - dump_se_priv( DBGC_ALL, 10, &mask ); + DEBUGADD( 10, ("new privilege mask: 0x%llx\n", (unsigned long long)mask)); return set_privileges( sid, &mask ); } -- cgit