Ok, this patch removes the privilege stuff we had in, unused, for some time.

The code was nice, but put in the wrong place (group mapping) and not
supported by most of the code, thus useless.

We will put back most of the code when our infrastructure will be changed
so that privileges actually really make sense to be set.

This is a first patch of a set to enhance all our mapping code cleaness and
stability towards a sane next beta for 3.0 code base

Simo.
(This used to be commit e341e7c49f8c17a9ee30ca3fab3aa0397c1f0c7e)

3 files changed, 32 insertions, 43 deletions

diff --git a/source3/include/mapping.h b/source3/include/mapping.h
index d4f2d28e6a..fdaa2b0453 100644
--- a/source3/include/mapping.h
+++ b/source3/include/mapping.h
@@ -19,29 +19,9 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define PRIV_ALL_INDEX		5
-
-#define SE_PRIV_NONE		0x0000
-#define SE_PRIV_ADD_MACHINES	0x0006
-#define SE_PRIV_SEC_PRIV	0x0008
-#define SE_PRIV_TAKE_OWNER	0x0009
-#define SE_PRIV_ADD_USERS	0xff01
-#define SE_PRIV_PRINT_OPERATOR	0xff03
-#define SE_PRIV_ALL		0xffff
-
 #define ENUM_ONLY_MAPPED True
 #define ENUM_ALL_MAPPED False
 
-#define MAPPING_WITH_PRIV True
-#define MAPPING_WITHOUT_PRIV False
-
-#define PR_NONE                0x0000
-#define PR_LOG_ON_LOCALLY      0x0001
-#define PR_ACCESS_FROM_NETWORK 0x0002
-#define PR_LOG_ON_BATCH_JOB    0x0004
-#define PR_LOG_ON_SERVICE      0x0010
-
-
 typedef struct _GROUP_MAP {
 	struct pdb_methods *methods;
 	gid_t gid;
@@ -49,13 +29,5 @@ typedef struct _GROUP_MAP {
 	enum SID_NAME_USE sid_name_use;
 	fstring nt_name;
 	fstring comment;
-	uint32 systemaccount;
-	PRIVILEGE_SET priv_set;
 } GROUP_MAP;
 
-typedef struct _PRIVS {
-	uint32 se_priv;
-	const char *priv;
-	const char *description;
-} PRIVS;
-
diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index e14e250d34..aeddcbcb3a 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -203,14 +203,11 @@ typedef struct pdb_context
 	
 	NTSTATUS (*pdb_delete_sam_account)(struct pdb_context *, SAM_ACCOUNT *username);
 
-	NTSTATUS (*pdb_getgrsid)(struct pdb_context *context, GROUP_MAP *map,
-				 DOM_SID sid, BOOL with_priv);
+	NTSTATUS (*pdb_getgrsid)(struct pdb_context *context, GROUP_MAP *map, DOM_SID sid);
 	
-	NTSTATUS (*pdb_getgrgid)(struct pdb_context *context, GROUP_MAP *map,
-				 gid_t gid, BOOL with_priv);
+	NTSTATUS (*pdb_getgrgid)(struct pdb_context *context, GROUP_MAP *map, gid_t gid);
 	
-	NTSTATUS (*pdb_getgrnam)(struct pdb_context *context, GROUP_MAP *map,
-				 char *name, BOOL with_priv);
+	NTSTATUS (*pdb_getgrnam)(struct pdb_context *context, GROUP_MAP *map, const char *name);
 	
 	NTSTATUS (*pdb_add_group_mapping_entry)(struct pdb_context *context,
 						GROUP_MAP *map);
@@ -224,7 +221,7 @@ typedef struct pdb_context
 	NTSTATUS (*pdb_enum_group_mapping)(struct pdb_context *context,
 					   enum SID_NAME_USE sid_name_use,
 					   GROUP_MAP **rmap, int *num_entries,
-					   BOOL unix_only, BOOL with_priv);
+					   BOOL unix_only);
 
 	void (*free_fn)(struct pdb_context **);
 	
@@ -257,14 +254,11 @@ typedef struct pdb_methods
 	
 	NTSTATUS (*delete_sam_account)(struct pdb_methods *, SAM_ACCOUNT *username);
 	
-	NTSTATUS (*getgrsid)(struct pdb_methods *methods, GROUP_MAP *map,
-			     DOM_SID sid, BOOL with_priv);
+	NTSTATUS (*getgrsid)(struct pdb_methods *methods, GROUP_MAP *map, DOM_SID sid);
 
-	NTSTATUS (*getgrgid)(struct pdb_methods *methods, GROUP_MAP *map,
-			     gid_t gid, BOOL with_priv);
+	NTSTATUS (*getgrgid)(struct pdb_methods *methods, GROUP_MAP *map, gid_t gid);
 
-	NTSTATUS (*getgrnam)(struct pdb_methods *methods, GROUP_MAP *map,
-			     char *name, BOOL with_priv);
+	NTSTATUS (*getgrnam)(struct pdb_methods *methods, GROUP_MAP *map, const char *name);
 
 	NTSTATUS (*add_group_mapping_entry)(struct pdb_methods *methods,
 					    GROUP_MAP *map);
@@ -278,7 +272,7 @@ typedef struct pdb_methods
 	NTSTATUS (*enum_group_mapping)(struct pdb_methods *methods,
 				       enum SID_NAME_USE sid_name_use,
 				       GROUP_MAP **rmap, int *num_entries,
-				       BOOL unix_only, BOOL with_priv);
+				       BOOL unix_only);
 
 	void *private_data;  /* Private data of some kind */
 	
diff --git a/source3/include/privileges.h b/source3/include/privileges.h
index 404c5d246b..67d8a2cbcc 100644
--- a/source3/include/privileges.h
+++ b/source3/include/privileges.h
@@ -23,6 +23,22 @@
 #ifndef PRIVILEGES_H
 #define PRIVILEGES_H
 
+#define PRIV_ALL_INDEX		5
+
+#define SE_PRIV_NONE		0x0000
+#define SE_PRIV_ADD_MACHINES	0x0006
+#define SE_PRIV_SEC_PRIV	0x0008
+#define SE_PRIV_TAKE_OWNER	0x0009
+#define SE_PRIV_ADD_USERS	0xff01
+#define SE_PRIV_PRINT_OPERATOR	0xff03
+#define SE_PRIV_ALL		0xffff
+
+#define PR_NONE                0x0000
+#define PR_LOG_ON_LOCALLY      0x0001
+#define PR_ACCESS_FROM_NETWORK 0x0002
+#define PR_LOG_ON_BATCH_JOB    0x0004
+#define PR_LOG_ON_SERVICE      0x0010
+
 typedef struct LUID
 {
 	uint32 low;
@@ -42,4 +58,11 @@ typedef struct privilege_set
 	LUID_ATTR *set;
 } PRIVILEGE_SET;
 
-#endif /* _RPC_LSA_H */
+typedef struct _PRIVS {
+	uint32 se_priv;
+	const char *priv;
+	const char *description;
+} PRIVS;
+
+
+#endif /* PRIVILEGES_H */