From: Gerald Carter <jerry@samba.org>
Date: Thu, 17 Feb 2005 22:46:41 +0000 (+0000)
Subject: r5436: small merges from trunk
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5255
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f17ffdf805ef8afad2b8d63b619c52540001a546;p=thirdparty%2Fsamba.git

r5436: small merges from trunk
---

diff --git a/source/lib/privileges.c b/source/lib/privileges.c
index 3960faecaa9..37695b42b4f 100644
--- a/source/lib/privileges.c
+++ b/source/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;