--- nautilus-2.18.0.1-orig/libnautilus-private/nautilus-directory-async.c	2007-04-10 02:59:55.163189000 +0200

+++ nautilus-2.18.0.1-alo/libnautilus-private/nautilus-directory-async.c	2007-04-03 12:36:03.664915000 +0200

@@ -2596,7 +2596,7 @@

 	gnome_vfs_async_load_directory

 		(&directory->details->mime_list_in_progress,

 		 uri,

-		 GNOME_VFS_FILE_INFO_GET_MIME_TYPE,

+		 (GNOME_VFS_FILE_INFO_GET_MIME_TYPE | GNOME_VFS_FILE_INFO_GET_ACL),

 		 DIRECTORY_LOAD_ITEMS_PER_CALLBACK,

 		 GNOME_VFS_PRIORITY_DEFAULT,

 		 mime_list_callback,

--- nautilus-2.18.0.1-orig/libnautilus-private/nautilus-file.h	2007-04-10 02:59:55.124136000 +0200

+++ nautilus-2.18.0.1-alo/libnautilus-private/nautilus-file.h	2007-04-03 12:36:02.762619000 +0200

@@ -201,6 +201,15 @@

 gboolean                nautilus_file_can_get_selinux_context           (NautilusFile                   *file);

 char *                  nautilus_file_get_selinux_context               (NautilusFile                   *file);

+/* ACL */

+gboolean                nautilus_file_can_get_acl                       (NautilusFile                   *file);

+gboolean                nautilus_file_can_set_acl                       (NautilusFile                   *file);

+GnomeVFSACL *           nautilus_file_get_acl                           (NautilusFile                   *file);

+GnomeVFSResult                     nautilus_file_set_acl                           (NautilusFile                   *file,

+                                                                        GnomeVFSACL                    *acl,

+                                                                        NautilusFileOperationCallback   callback,

+									 gpointer                        callback_data);

+

 /* "Capabilities". */

 gboolean                nautilus_file_can_read                          (NautilusFile                   *file);

 gboolean                nautilus_file_can_write                         (NautilusFile                   *file);

--- nautilus-2.18.0.1-orig/libnautilus-private/nautilus-file.c	2007-04-10 02:59:55.240107000 +0200

+++ nautilus-2.18.0.1-alo/libnautilus-private/nautilus-file.c	2007-04-03 12:36:06.206964000 +0200

@@ -65,6 +65,7 @@

 #include <libgnomevfs/gnome-vfs-volume.h>

 #include <libgnomevfs/gnome-vfs-volume-monitor.h>

 #include <libgnomevfs/gnome-vfs-drive.h>

+#include <libgnomevfs/gnome-vfs-ops.h>

 #include <glib/gfileutils.h>

 #include <libnautilus-extension/nautilus-file-info.h>

 #include <libxml/parser.h>

@@ -73,6 +74,7 @@

 #include <sys/time.h>

 #include <time.h>

 #include <unistd.h>

+#include <errno.h>

 #ifdef HAVE_SELINUX

 #include <selinux/selinux.h>

@@ -661,6 +663,30 @@

 	return nautilus_directory_get_corresponding_file (file->details->directory);

 }

+static GnomeVFSACLPerm

+to_acl_perm (GnomeVFSFilePermissions p)

+{

+	if ((p == GNOME_VFS_PERM_USER_READ)  ||

+	    (p == GNOME_VFS_PERM_GROUP_READ) ||

+	    (p == GNOME_VFS_PERM_OTHER_READ) ||

+	    (p == GNOME_VFS_PERM_ACCESS_READABLE)) 

+		return GNOME_VFS_ACL_READ; 

+

+	if ((p == GNOME_VFS_PERM_USER_WRITE)  ||

+	    (p == GNOME_VFS_PERM_GROUP_WRITE) ||

+	    (p == GNOME_VFS_PERM_OTHER_WRITE) ||

+	    (p == GNOME_VFS_PERM_ACCESS_WRITABLE)) 

+		return GNOME_VFS_ACL_WRITE;

+

+	if ((p == GNOME_VFS_PERM_USER_EXEC)  ||

+	    (p == GNOME_VFS_PERM_GROUP_EXEC) ||

+	    (p == GNOME_VFS_PERM_OTHER_EXEC) ||

+	    (p == GNOME_VFS_PERM_ACCESS_EXECUTABLE)) 

+		return GNOME_VFS_ACL_EXECUTE; 

+	

+	return GNOME_VFS_ACL_PERM_NULL;

+}

+

 /**

  * nautilus_file_denies_access_permission:

  * 

@@ -681,6 +707,9 @@

 nautilus_file_denies_access_permission (NautilusFile *file, 

 				        GnomeVFSFilePermissions permissions)

 {

+ 	GList *acls, *iter;	

+ 	GnomeVFSACL *acl;

+

 	g_assert (NAUTILUS_IS_FILE (file));

 	g_assert (permissions & (GNOME_VFS_PERM_ACCESS_READABLE |

 				 GNOME_VFS_PERM_ACCESS_WRITABLE |

@@ -698,7 +727,10 @@

 		return FALSE;

 	}

-	return (file->details->info->permissions & permissions) != permissions;

+	if ((file->details->info->permissions & permissions) == permissions)

+		return FALSE;

+

+ 	return TRUE;

 }

 /**

@@ -3438,6 +3470,134 @@

 	return !nautilus_file_info_missing (file, GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS);

 }

+gboolean

+nautilus_file_can_get_acl (NautilusFile *file)

+{

+	return !nautilus_file_info_missing (file, GNOME_VFS_FILE_INFO_FIELDS_ACL);

+}

+

+gboolean                

+nautilus_file_can_set_acl (NautilusFile *file)

+{

+	uid_t user_id;

+

+  	if (!nautilus_file_can_get_acl (file)) { 

+  		return FALSE; 

+  	} 

+

+	/* Check the user. */

+	user_id = geteuid();

+

+	/* Owner is allowed to set group (with restrictions). */

+	if (user_id == (uid_t) file->details->info->uid) {

+		return TRUE;

+	}

+

+	/* Root is also allowed to set group. */

+	if (user_id == 0) {

+		return TRUE;

+	}

+

+	return FALSE;

+}

+

+static void

+set_permissions_callback (GnomeVFSAsyncHandle *handle,

+			  GnomeVFSResult result,

+			  GnomeVFSFileInfo *new_info,

+			  gpointer callback_data)

+{

+	Operation *op;

+

+	op = callback_data;

+	g_assert (handle == op->handle);

+

+	if (result == GNOME_VFS_OK && new_info != NULL) {

+		nautilus_file_update_info (op->file, new_info, op->use_slow_mime);

+	}

+	operation_complete (op, result);

+}

+

+static void

+set_acl_callback (GnomeVFSAsyncHandle *handle,

+		  GnomeVFSResult result,

+		  GnomeVFSFileInfo *new_info,

+		  gpointer callback_data)

+{

+	Operation *op;

+

+	op = callback_data;

+	g_assert (handle == op->handle);

+

+	if (result == GNOME_VFS_OK && new_info != NULL) {

+		if (op->file->details->info->acl != NULL) 

+			g_object_unref (op->file->details->info->acl);

+

+		op->file->details->info->acl = new_info->acl;

+	} 

+

+	operation_complete (op, result);

+}

+

+

+GnomeVFSACL *           

+nautilus_file_get_acl (NautilusFile *file)

+{

+	return nautilus_file_info_missing (file, GNOME_VFS_FILE_INFO_FIELDS_ACL)

+		? NULL : file->details->info->acl;	

+}

+

+// void

+GnomeVFSResult 

+nautilus_file_set_acl (NautilusFile                   *file,

+		       GnomeVFSACL                    *acl,

+		       NautilusFileOperationCallback   callback,

+		       gpointer                        callback_data)

+{

+	Operation *op;

+	GnomeVFSURI *vfs_uri;

+	GnomeVFSFileInfo *partial_file_info;

+	GnomeVFSFileInfoOptions options;

+	GnomeVFSResult re;

+

+	if (!nautilus_file_can_set_acl (file)) {

+		nautilus_file_changed (file);

+		(* callback) (file, GNOME_VFS_ERROR_ACCESS_DENIED, callback_data);

+		return;

+	}

+

+	op = operation_new (file, callback, callback_data);

+	op->use_slow_mime = file->details->got_slow_mime_type;

+

+	options = GNOME_VFS_FILE_INFO_GET_ACL

+		| GNOME_VFS_FILE_INFO_GET_MIME_TYPE

+		| GNOME_VFS_FILE_INFO_FOLLOW_LINKS;

+	if (op->use_slow_mime) {

+		options |= GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE;

+	}

+

+	partial_file_info = gnome_vfs_file_info_new ();

+	gnome_vfs_file_info_copy (partial_file_info, file->details->info);

+	partial_file_info->acl = acl;

+	vfs_uri = nautilus_file_get_gnome_vfs_uri (file);	

+#if 0

+	gnome_vfs_async_set_file_info (&op->handle,

+				       vfs_uri, partial_file_info, 

+				       GNOME_VFS_SET_FILE_INFO_ACL,

+				       options,

+				       GNOME_VFS_PRIORITY_DEFAULT,

+				       set_acl_callback, op);	

+#else 

+	re = gnome_vfs_set_file_info_uri (vfs_uri, partial_file_info, 

+					  GNOME_VFS_SET_FILE_INFO_ACL);

+	callback (file, re, callback_data);

+#endif

+	gnome_vfs_file_info_unref (partial_file_info);

+	gnome_vfs_uri_unref (vfs_uri);

+

+	return re;

+}

+

 /**

  * nautilus_file_can_set_permissions:

  * 

@@ -3486,22 +3646,6 @@

 	return file->details->info->permissions;

 }

-static void

-set_permissions_callback (GnomeVFSAsyncHandle *handle,

-			  GnomeVFSResult result,

-			  GnomeVFSFileInfo *new_info,

-			  gpointer callback_data)

-{

-	Operation *op;

-

-	op = callback_data;

-	g_assert (handle == op->handle);

-

-	if (result == GNOME_VFS_OK && new_info != NULL) {

-		nautilus_file_update_info (op->file, new_info, op->use_slow_mime);

-	}

-	operation_complete (op, result);

-}

 /**

  * nautilus_file_set_permissions:

@@ -3553,6 +3697,7 @@

 	}

 	/* Change the file-on-disk permissions. */

 	partial_file_info = gnome_vfs_file_info_new ();

+	gnome_vfs_file_info_copy(partial_file_info, file->details->info);

 	partial_file_info->permissions = new_permissions;

 	vfs_uri = nautilus_file_get_gnome_vfs_uri (file);

 	gnome_vfs_async_set_file_info (&op->handle,

--- nautilus-2.18.0.1-orig/libnautilus-private/nautilus-file-private.h	2007-04-10 02:59:55.167442000 +0200

+++ nautilus-2.18.0.1-alo/libnautilus-private/nautilus-file-private.h	2007-04-03 12:36:04.930411000 +0200

@@ -42,7 +42,8 @@

 	(GNOME_VFS_FILE_INFO_FOLLOW_LINKS | \

 	 GNOME_VFS_FILE_INFO_GET_MIME_TYPE |	\

 	 GNOME_VFS_FILE_INFO_GET_SELINUX_CONTEXT | \

-	 GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS)

+	 GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS | \

+         GNOME_VFS_FILE_INFO_GET_ACL)

 /* These are in the typical sort order. Known things come first, then

  * things where we can't know, finally things where we don't yet know.

--- nautilus-2.18.0.1-orig/src/file-manager/fm-properties-window.c	2007-04-10 02:59:55.413853000 +0200

+++ nautilus-2.18.0.1-alo/src/file-manager/fm-properties-window.c	2007-04-10 01:41:45.120623000 +0200

@@ -3,6 +3,7 @@

 /* fm-properties-window.c - window that lets user modify file properties

    Copyright (C) 2000 Eazel, Inc.

+   Copyright (C) 2006 Sun Microsystems, Inc.

    The Gnome Library is free software; you can redistribute it and/or

    modify it under the terms of the GNU Library General Public License as

@@ -20,6 +21,7 @@

    Boston, MA 02111-1307, USA.

    Authors: Darin Adler <[email protected]>

+            Alvaro Lopez Ortega <[email protected]>

 */

 #include <config.h>

@@ -86,6 +88,96 @@

 #define ROW_PAD 6

+                           /* SUN_BRANDING */

+#define DEFAULT_USER_STR   _("Default user")

+                           /* SUN_BRANDING */

+#define DEFAULT_GROUP_STR  _("Default group")

+                           /* SUN_BRANDING */

+#define DEFAULT_OTHERS_STR _("Default others")

+                           /* SUN_BRANDING */

+#define DEFAULT_MASK_STR   _("Default mask")

+                           /* SUN_BRANDING */

+#define MASK_STR           _("Mask")

+

+enum {

+       COL_KIND = 0,

+       COL_ICON,

+       COL_USER,

+       COL_PERM_READ,

+       COL_PERM_WRITE,

+       COL_PERM_EXECUTE,

+       COL_EFFECTIVE,

+       NUM_COLS

+};

+

+enum {

+       COL_USER_ENTRY,

+/*        COL_NEG_USER_ENTRY, */

+       COL_GROUP_ENTRY,

+/*        COL_NEG_GROUP_ENTRY, */

+       NUM_PERM_TYPES

+};

+

+enum {

+       COL_ICON_USER,

+       COL_ICON_NEG_USER,

+       COL_ICON_GROUP,

+       COL_ICON_NEG_GROUP,

+       COL_ICON_MASK,

+       COL_ICON_OTHER,

+       COL_ICON_NEG_OTHER,

+       NUM_COL_ICONS

+};

+

+enum {

+	NFS4_ACL_LIST_USER = 0,

+	NFS4_ACL_LIST_ICON,

+	NFS4_ACL_LIST_TYPE,

+	NFS4_ACL_LIST_KIND,

+	NFS4_ACL_LIST_N_COLUMNS

+};

+

+

+enum {

+	NFS4_PERMISSIONS_SELECTED = 0,

+	NFS4_PERMISSIONS_NAME,

+	NFS4_PERMISSIONS_INCONSISTENT,

+	NFS4_PERMISSIONS_N_COLUMNS

+};

+

+/* SUN_BRANDING */

+#define ACL_NFS4_APPLY_TO_THIS_FOLDER      _("This folder") 

+#define ACL_NFS4_APPLY_TO_CHILD_FOLDERS    _("Child folders")

+#define ACL_NFS4_APPLY_TO_CHILD_FILES      _("Child files")

+#define ACL_NFS4_APPLY_TO_ALL_DESCENDANTS  _("All descendants")

+

+#define ACL_NFS4_TYPE_ALLOW                _("Allow")

+#define ACL_NFS4_TYPE_DENY                 _("Deny")

+

+#define ACL_NFS4_PERM_ADMIN                _("Administration")

+#define ACL_NFS4_PERM_CHANGE_PERM          _("Change Permissions")

+#define ACL_NFS4_PERM_CHANGE_OWNER         _("Change Owner")

+#define ACL_NFS4_PERM_READ                 _("Read")

+#define ACL_NFS4_PERM_READ_ATTRIBUTES      _("Read Attributes")

+#define ACL_NFS4_PERM_READ_EXT_ATTRIBUTES  _("Read Extended Attributes")

+#define ACL_NFS4_PERM_LIST_CONTENTS        _("List Folder Contents (Read Data)")

+#define ACL_NFS4_PERM_TRAVERSE_FOLDER      _("Traverse Folder (Execute File)")

+#define ACL_NFS4_PERM_READ_PERMISSIONS     _("Read Permissions")

+#define ACL_NFS4_PERM_WRITE                _("Write")

+#define ACL_NFS4_PERM_WRITE_ATTRIBUTES     _("Write Attributes")

+#define ACL_NFS4_PERM_WRITE_EXT_ATTRIBUTES _("Write Extended Attributes")

+#define ACL_NFS4_PERM_CREATE_FILES         _("Create Files (Write Data)")

+#define ACL_NFS4_PERM_CREATE_FOLDER        _("Create Folder (Append Data)")

+#define ACL_NFS4_PERM_DELETE               _("Delete")

+#define ACL_NFS4_PERM_DELETE_SUBFOLDERS    _("Delete Subfolders and Files")

+

+#define ACL_NFS4_WHO_OWNER_USER            _("Owner user")

+#define ACL_NFS4_WHO_OWNER_GROUP           _("Owner group")

+#define ACL_NFS4_WHO_USER                  _("User")

+#define ACL_NFS4_WHO_GROUP                 _("Group")

+#define ACL_NFS4_WHO_EVERYBODY             _("Everybody")

+

+

 static GHashTable *windows;

 static GHashTable *pending_lists;

@@ -127,6 +219,14 @@

 	GHashTable *initial_permissions;

 	gboolean has_recursive_apply;

+	GtkWidget *acl_view;

+	GtkWidget *acl_default_view;

+	GHashTable *initial_acl;

+	GdkPixbuf *acl_icons[NUM_COL_ICONS];

+	GtkWidget *acl_buttons;

+	GtkWidget *acl_def_buttons;

+	gboolean   updating_acl_tab;

+

 	GList *value_fields;

 	GList *mime_list;

@@ -1135,6 +1235,362 @@

 	return ret;

 }

+

+static void

+update_acl_page_add_entry (FMPropertiesWindow *window, GnomeVFSACL *acl) 

+{

+	GList *ace_list;

+	GList *i;

+	GnomeVFSACE *ace;

+	gboolean  mr,mw,mx;

+	gboolean  imr,imw,imx;

+

+	imr = imw = imx = TRUE;

+

+	/* Read the mask

+	 */

+	ace_list = gnome_vfs_acl_get_ace_list (acl);

+

+	mx = mw = mx = TRUE;

+	for (i=ace_list; i; i=i->next) {

+		ace = i->data;

+		if (gnome_vfs_ace_get_kind (ace) == GNOME_VFS_ACL_MASK) {

+			if (gnome_vfs_ace_get_inherance (ace)) {

+				imr = gnome_vfs_ace_check_perm (ace, GNOME_VFS_ACL_READ);

+				imw = gnome_vfs_ace_check_perm (ace, GNOME_VFS_ACL_WRITE);

+				imx = gnome_vfs_ace_check_perm (ace, GNOME_VFS_ACL_EXECUTE);

+			} else {

+				mr = gnome_vfs_ace_check_perm (ace, GNOME_VFS_ACL_READ);

+				mw = gnome_vfs_ace_check_perm (ace, GNOME_VFS_ACL_WRITE);

+				mx = gnome_vfs_ace_check_perm (ace, GNOME_VFS_ACL_EXECUTE);

+			}

+		}

+	}	

+

+	/* Add the ACL entries

+	 */

+	for (i=ace_list; i; i=i->next) {

+		const char            *id;

+		const GnomeVFSACLPerm *perms;

+		GnomeVFSACLKind        kind;

+		gboolean               inherit;

+		gchar                  masked_str[4] = {'-','-','-',0};

+		gboolean               r,w,x;

+		GdkPixbuf              *icon = NULL;		

+

+		GtkTreeIter   iter;

+		GtkTreeModel *model;

+

+		ace      = i->data;

+

+		id       = gnome_vfs_ace_get_id (ace);

+		kind     = gnome_vfs_ace_get_kind (ace);

+		perms    = gnome_vfs_ace_get_perms (ace);

+		inherit  = gnome_vfs_ace_get_inherance (ace);

+

+		r = gnome_vfs_ace_check_perm (ace, GNOME_VFS_ACL_READ);

+		w = gnome_vfs_ace_check_perm (ace, GNOME_VFS_ACL_WRITE);

+		x = gnome_vfs_ace_check_perm (ace, GNOME_VFS_ACL_EXECUTE);

+

+		if (inherit) {

+			if (imr & r) masked_str[0] = 'r';	

+			if (imw & w) masked_str[1] = 'w';	

+			if (imx & x) masked_str[2] = 'x';

+		} else {

+			if (mr & r) masked_str[0] = 'r';	

+			if (mw & w) masked_str[1] = 'w';	

+			if (mx & x) masked_str[2] = 'x';

+		}

+

+		if (inherit)

+			model = gtk_tree_view_get_model (GTK_TREE_VIEW (window->details->acl_default_view));  

+		else 

+			model = gtk_tree_view_get_model (GTK_TREE_VIEW (window->details->acl_view));  

+

+		switch (kind) {

+		case GNOME_VFS_ACL_USER:

+			if (inherit && !id)

+				id = DEFAULT_USER_STR;

+

+			if (id != NULL) {

+				icon = window->details->acl_icons[COL_ICON_USER];

+				gtk_list_store_append (model , &iter);

+				gtk_list_store_set (model, &iter, 

+						    COL_ICON, icon,

+						    COL_KIND, kind, 

+						    COL_USER, id,

+						    COL_PERM_READ, r,

+						    COL_PERM_WRITE, w,

+						    COL_PERM_EXECUTE, x,

+						    COL_EFFECTIVE, masked_str,

+						    -1);

+			}

+			break;

+		case GNOME_VFS_ACL_GROUP:

+			if (inherit && !id)

+				id = DEFAULT_GROUP_STR;

+

+			if (id != NULL) {

+				icon = window->details->acl_icons[COL_ICON_GROUP];

+

+				gtk_list_store_append (model , &iter);

+				gtk_list_store_set (model, &iter, 

+						    COL_ICON, icon,

+						    COL_KIND, kind, 

+						    COL_USER, id, 

+						    COL_PERM_READ, r,

+						    COL_PERM_WRITE, w,

+						    COL_PERM_EXECUTE, x,

+						    COL_EFFECTIVE, masked_str,

+						    -1);

+			}

+			break;

+		case GNOME_VFS_ACL_OTHER:

+			if (inherit && !id)

+				id = DEFAULT_OTHERS_STR;

+

+			if (id != NULL) {

+				icon = window->details->acl_icons[COL_ICON_OTHER];