s3-smbd: Move smb_acl_t declaration to smb_acl.idl

This will allow us to marshall this into and from an NDR blob on disk, which will
allow us to fake up ACL support during make test, and to test the NT ACL emulation
using python bindings via the VFS.

Andrew Bartlett

1 files changed, 3 insertions, 34 deletions

diff --git a/source3/include/smb_acls.h b/source3/include/smb_acls.h
index 4998e4b07d..2a47661ede 100644
--- a/source3/include/smb_acls.h
+++ b/source3/include/smb_acls.h
@@ -20,51 +20,20 @@
 #ifndef _SMB_ACLS_H
 #define _SMB_ACLS_H
 
+#include "librpc/gen_ndr/smb_acl.h"
+
 struct vfs_handle_struct;
 struct files_struct;
 
 typedef int			SMB_ACL_TYPE_T;
 typedef mode_t			*SMB_ACL_PERMSET_T;
 typedef mode_t			SMB_ACL_PERM_T;
-#define SMB_ACL_READ 				4
-#define SMB_ACL_WRITE 				2
-#define SMB_ACL_EXECUTE				1
-
-/* Types of ACLs. */
-enum smb_acl_tag_t {
-	SMB_ACL_TAG_INVALID=0,
-	SMB_ACL_USER=1,
-	SMB_ACL_USER_OBJ,
-	SMB_ACL_GROUP,
-	SMB_ACL_GROUP_OBJ,
-	SMB_ACL_OTHER,
-	SMB_ACL_MASK
-};
 
 typedef enum smb_acl_tag_t SMB_ACL_TAG_T;
-
-struct smb_acl_entry {
-	enum smb_acl_tag_t a_type;
-	SMB_ACL_PERM_T a_perm;
-	uid_t uid;
-	gid_t gid;
-};
-
-typedef struct smb_acl_t {
-	int	size;
-	int	count;
-	int	next;
-	struct smb_acl_entry *acl;
-} *SMB_ACL_T;
+typedef struct smb_acl_t *SMB_ACL_T;
 
 typedef struct smb_acl_entry 	*SMB_ACL_ENTRY_T;
 
-#define SMB_ACL_FIRST_ENTRY			0
-#define SMB_ACL_NEXT_ENTRY			1
-
-#define SMB_ACL_TYPE_ACCESS			0
-#define SMB_ACL_TYPE_DEFAULT		1
-
 /* The following definitions come from lib/sysacls.c  */
 
 int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p);