X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Facls.c;h=9c81c387da96054a6ae8794f256cc1252d6212fd;hb=240a63e9598fafe971b58274697e02c1335fd60a;hp=5a112dede6f1bc8ef5a5d63e01b7542d516db49a;hpb=f119d0e5b18b7286d04fc536a94e0f96e3c51714;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/acls.c b/Kernel/vfs/acls.c
index 5a112ded..9c81c387 100644
--- a/Kernel/vfs/acls.c
+++ b/Kernel/vfs/acls.c
@@ -6,10 +6,10 @@
 #include "vfs_int.h"
 
 // === GLOBALS ===
-tVFS_ACL	gVFS_ACL_EveryoneRWX = { {0,-1}, {0,VFS_PERM_ALL} };
-tVFS_ACL	gVFS_ACL_EveryoneRW = { {0,-1}, {0,VFS_PERM_ALL^VFS_PERM_EXECUTE} };
-tVFS_ACL	gVFS_ACL_EveryoneRX = { {0,-1}, {0,VFS_PERM_READ|VFS_PERM_EXECUTE} };
-tVFS_ACL	gVFS_ACL_EveryoneRO = { {0,-1}, {0,VFS_PERM_READ} };
+tVFS_ACL	gVFS_ACL_EveryoneRWX = { {1,-1}, {0,VFS_PERM_ALL} };
+tVFS_ACL	gVFS_ACL_EveryoneRW = { {1,-1}, {0,VFS_PERM_ALL^VFS_PERM_EXECUTE} };
+tVFS_ACL	gVFS_ACL_EveryoneRX = { {1,-1}, {0,VFS_PERM_READ|VFS_PERM_EXECUTE} };
+tVFS_ACL	gVFS_ACL_EveryoneRO = { {1,-1}, {0,VFS_PERM_READ} };
 
 // === CODE ===
 /**
@@ -56,3 +56,46 @@ int VFS_CheckACL(tVFS_Node *Node, Uint Permissions)
 	
 	return 0;
 }
+/**
+ * \fn int VFS_GetACL(int FD, tVFS_ACL *Dest)
+ */
+int VFS_GetACL(int FD, tVFS_ACL *Dest)
+{
+	 int	i;
+	tVFS_Handle	*h = VFS_GetHandle(FD);
+	
+	// Error check
+	if(!h) {
+		return -1;
+	}
+	
+	// Root can do anything
+	if(Dest->Group == 0 && Dest->ID == 0) {
+		Dest->Inv = 0;
+		Dest->Perms = -1;
+		return 1;
+	}
+	
+	// Root only file?, fast return
+	if( h->Node->NumACLs == 0 ) {
+		Dest->Inv = 0;
+		Dest->Perms = 0;
+		return 0;
+	}
+	
+	// Check Deny Permissions
+	for(i=0;i<h->Node->NumACLs;i++)
+	{
+		if(h->Node->ACLs[i].Group != Dest->Group)	continue;
+		if(h->Node->ACLs[i].ID != Dest->ID)	continue;
+		
+		Dest->Inv = h->Node->ACLs[i].Inv;
+		Dest->Perms = h->Node->ACLs[i].Perms;
+		return 1;
+	}
+	
+	
+	Dest->Inv = 0;
+	Dest->Perms = 0;
+	return 0;
+}