diff options
author | Gerald Carter <jerry@samba.org> | 2005-02-17 22:46:41 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:55:40 -0500 |
commit | bfc76114f65964262d1bf04d72cacefc2ae26680 (patch) | |
tree | 609fefb4cfbc36a6461adb2d0899f60367cb50e2 /source3 | |
parent | 4e8c17d98589c2983b6a4efdbe0563cbb8ab4e19 (diff) | |
download | samba-bfc76114f65964262d1bf04d72cacefc2ae26680.tar.gz samba-bfc76114f65964262d1bf04d72cacefc2ae26680.tar.bz2 samba-bfc76114f65964262d1bf04d72cacefc2ae26680.zip |
r5436: small merges from trunk
(This used to be commit f17ffdf805ef8afad2b8d63b619c52540001a546)
Diffstat (limited to 'source3')
-rw-r--r-- | source3/lib/privileges.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c index 3960faecaa..37695b42b4 100644 --- a/source3/lib/privileges.c +++ b/source3/lib/privileges.c @@ -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; |