r4849: * finish SeAddUsers support in srv_samr_nt.c

* define some const SE_PRIV structure for use when
  you need a SE_PRIV* to a privilege
* fix an annoying compiler warngin in smbfilter.c
* translate SIDs to names in 'net rpc rights list accounts'
* fix a seg fault in cli_lsa_enum_account_rights caused by
  me forgetting the precedence of * vs. []
(This used to be commit d25fc84bc2b14da9fcc0f3c8d7baeca83f0ea708)

1 files changed, 17 insertions, 36 deletions

diff --git a/source3/include/privileges.h b/source3/include/privileges.h
index 85087f624f..76cabf3ba9 100644
--- a/source3/include/privileges.h
+++ b/source3/include/privileges.h
@@ -25,6 +25,15 @@
 #ifndef PRIVILEGES_H
 #define PRIVILEGES_H
 
+/* privilege bitmask */
+
+#define SE_PRIV_MASKSIZE 4
+
+typedef struct {
+	uint32 mask[SE_PRIV_MASKSIZE];
+} SE_PRIV;
+
+
 /* common privilege defines */
 
 #define SE_END				{ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 } }
@@ -48,36 +57,14 @@
 #define SE_DISK_OPERATOR		{ { 0x00000080, 0x00000000, 0x00000000, 0x00000000 } }
 #define SE_REMOTE_SHUTDOWN		{ { 0x00000100, 0x00000000, 0x00000000, 0x00000000 } }
 
-#if 0	/* not needed currently */
-
-#define SE_ASSIGN_PRIMARY_TOKEN	
-#define SE_CREATE_TOKEN		
-#define SE_LOCK_MEMORY		
-#define SE_INCREASE_QUOTA	
-#define SE_UNSOLICITED_INPUT
-#define SE_TCB	
-#define SE_SECURITY	
-#define SE_TAKE_OWNERSHIP
-#define SE_LOAD_DRIVER	
-#define SE_SYSTEM_PROFILE	
-#define SE_SYSTEM_TIME	
-#define SE_PROF_SINGLE_PROCESS	
-#define SE_INC_BASE_PRIORITY
-#define SE_CREATE_PAGEFILE
-#define SE_CREATE_PERMANENT	
-#define SE_BACKUP
-#define SE_RESTORE
-#define SE_SHUTDOWN	
-#define SE_DEBUG
-#define SE_AUDIT	
-#define SE_SYSTEM_ENVIRONMENT	
-#define SE_CHANGE_NOTIFY
-#define SE_REMOTE_SHUTDOWN
-#define SE_UNDOCK
-#define SE_SYNC_AGENT	
-#define SE_ENABLE_DELEGATION
-
-#endif	/* not needed currently */
+/* defined in lib/privilegs.c */
+
+extern const SE_PRIV se_machine_account;
+extern const SE_PRIV se_print_operator;
+extern const SE_PRIV se_add_users;
+extern const SE_PRIV se_disk_operators;
+extern const SE_PRIV se_remote_shutdown;
+
 
 /*
  * These are used in Lsa replies (srv_lsa_nt.c)
@@ -115,12 +102,6 @@ typedef struct privilege_set
 	LUID_ATTR *set;
 } PRIVILEGE_SET;
 
-#define SE_PRIV_MASKSIZE 4
-
-typedef struct {
-	uint32 mask[SE_PRIV_MASKSIZE];
-} SE_PRIV;
-
 typedef struct _PRIVS {
 	SE_PRIV se_priv;
 	const char *name;