From 4591fdbc18b0d7a1117de196675067e88bc341b7 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Sat, 5 Jun 2010 02:39:11 +0200
Subject: s3-privileges: use LUID defines from lsa IDL.

Guenther
---
 source3/include/privileges.h | 16 ++++------------
 source3/include/proto.h      |  6 +++---
 2 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'source3/include')

diff --git a/source3/include/privileges.h b/source3/include/privileges.h
index 57d3fc0686..35fccd38a8 100644
--- a/source3/include/privileges.h
+++ b/source3/include/privileges.h
@@ -25,6 +25,8 @@
 #ifndef PRIVILEGES_H
 #define PRIVILEGES_H
 
+#include "../librpc/gen_ndr/lsa.h"
+
 /* privilege bitmask */
 
 #define SE_PRIV_MASKSIZE 4
@@ -78,29 +80,19 @@ extern const SE_PRIV se_take_ownership;
  * These are used in Lsa replies (srv_lsa_nt.c)
  */
 
-typedef struct {
-	uint32 high;
-	uint32 low;
-} LUID;
-
-typedef struct {
-	LUID luid;
-	uint32 attr;
-} LUID_ATTR;
-
 typedef struct {
 	TALLOC_CTX *mem_ctx;
 	bool ext_ctx;
 	uint32 count;
 	uint32 control;
-	LUID_ATTR *set;
+	struct lsa_LUIDAttribute *set;
 } PRIVILEGE_SET;
 
 typedef struct {
 	SE_PRIV se_priv;
 	const char *name;
 	const char *description;
-	LUID luid;
+	struct lsa_LUID luid;
 } PRIVS;
 
 #endif /* PRIVILEGES_H */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 41ab440fd8..86a725ade8 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -694,7 +694,7 @@ NTSTATUS privilege_delete_account(const struct dom_sid *sid);
 NTSTATUS privilege_set_init(PRIVILEGE_SET *priv_set);
 NTSTATUS privilege_set_init_by_ctx(TALLOC_CTX *mem_ctx, PRIVILEGE_SET *priv_set);
 void privilege_set_free(PRIVILEGE_SET *priv_set);
-NTSTATUS dup_luid_attr(TALLOC_CTX *mem_ctx, LUID_ATTR **new_la, LUID_ATTR *old_la, int count);
+NTSTATUS dup_luid_attr(TALLOC_CTX *mem_ctx, struct lsa_LUIDAttribute **new_la, struct lsa_LUIDAttribute *old_la, int count);
 bool is_privileged_sid( const struct dom_sid *sid );
 bool grant_all_privileges( const struct dom_sid *sid );
 
@@ -713,8 +713,8 @@ const char* get_privilege_dispname( const char *name );
 bool user_has_privileges(const NT_USER_TOKEN *token, const SE_PRIV *privilege);
 bool user_has_any_privilege(NT_USER_TOKEN *token, const SE_PRIV *privilege);
 int count_all_privileges( void );
-LUID_ATTR get_privilege_luid( SE_PRIV *mask );
-const char *luid_to_privilege_name(const LUID *set);
+struct lsa_LUIDAttribute get_privilege_luid( SE_PRIV *mask );
+const char *luid_to_privilege_name(const struct lsa_LUID *set);
 bool se_priv_to_privilege_set( PRIVILEGE_SET *set, SE_PRIV *mask );
 bool privilege_set_to_se_priv( SE_PRIV *mask, struct lsa_PrivilegeSet *privset );
 
-- 
cgit