1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00

r5436: small merges from trunk

(This used to be commit f17ffdf805ef8afad2b8d63b619c52540001a546)
This commit is contained in:
Gerald Carter 2005-02-17 22:46:41 +00:00 committed by Gerald (Jerry) Carter
parent 4e8c17d985
commit bfc76114f6

View File

@ -1,7 +1,7 @@
/*
Unix SMB/CIFS implementation.
Privileges handling functions
Copyright (C) Jean François Micouleau 1998-2001
Copyright (C) Jean François Micouleau 1998-2001
Copyright (C) Simo Sorce 2002-2003
Copyright (C) Gerald (Jerry) Carter 2004
@ -27,8 +27,8 @@
#define GENERATE_LUID_LOW(x) (x)+1;
static SE_PRIV se_priv_all = SE_ALL_PRIVS;
static SE_PRIV se_priv_end = SE_END;
static const SE_PRIV se_priv_all = SE_ALL_PRIVS;
static const SE_PRIV se_priv_end = SE_END;
/* Define variables for all privileges so we can use the
SE_PRIV* in the various se_priv_XXX() functions */
@ -503,7 +503,7 @@ NTSTATUS privilege_enumerate_accounts(DOM_SID **sids, int *num_sids)
Add privilege to sid
****************************************************************************/
BOOL grant_privilege(const DOM_SID *sid, SE_PRIV *priv_mask)
BOOL grant_privilege(const DOM_SID *sid, const SE_PRIV *priv_mask)
{
SE_PRIV old_mask, new_mask;
@ -548,7 +548,7 @@ BOOL grant_privilege_by_name(DOM_SID *sid, const char *name)
Remove privilege from sid
****************************************************************************/
BOOL revoke_privilege(const DOM_SID *sid, SE_PRIV *priv_mask)
BOOL revoke_privilege(const DOM_SID *sid, const SE_PRIV *priv_mask)
{
SE_PRIV mask;