r15326 - /desktop/experimental/nautilus/debian/patches/07_desktop_file_activation.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Wed Mar 19 15:08:16 2008
New Revision: 15326

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15326
Log:
* updated to also allow starters owned by root

Modified:
    desktop/experimental/nautilus/debian/patches/07_desktop_file_activation.patch

Modified: desktop/experimental/nautilus/debian/patches/07_desktop_file_activation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/07_desktop_file_activation.patch?rev=15326&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/07_desktop_file_activation.patch (original)
+++ desktop/experimental/nautilus/debian/patches/07_desktop_file_activation.patch Wed Mar 19 15:08:16 2008
@@ -1,8 +1,9 @@
 Fixes two security issues about disguised .desktop files.
 Debian #408556, GNOME #405291
 Debian #408948, GNOME #405052
---- nautilus-2.22.0/libnautilus-private/nautilus-file.c.old	2008-03-17 11:21:33.000000000 +0100
-+++ nautilus-2.22.0/libnautilus-private/nautilus-file.c	2008-03-17 11:36:43.000000000 +0100
+diff -Naur nautilus-2.22.0.old/libnautilus-private/nautilus-file.c nautilus-2.22.0/libnautilus-private/nautilus-file.c
+--- nautilus-2.22.0.old/libnautilus-private/nautilus-file.c	2008-03-19 16:04:39.000000000 +0100
++++ nautilus-2.22.0/libnautilus-private/nautilus-file.c	2008-03-19 16:06:54.000000000 +0100
 @@ -41,6 +41,7 @@
  #include "nautilus-link.h"
  #include "nautilus-metadata.h"
@@ -11,7 +12,7 @@
  #include "nautilus-search-directory.h"
  #include "nautilus-search-directory-file.h"
  #include "nautilus-thumbnails.h"
-@@ -1084,6 +1085,45 @@
+@@ -1084,6 +1085,46 @@
  	return g_file_get_child (dir, eel_ref_str_peek (file->details->name));
  }
  
@@ -46,6 +47,7 @@
 +	g_free (scheme);
 +
 +	if (file->details->uid != -1 &&
++	    file->details->uid != 0 &&
 +	    (uid_t) file->details->uid != geteuid ())
 +		ret = FALSE;
 +
@@ -57,7 +59,7 @@
  /* Return the actual uri associated with the passed-in file. */
  char *
  nautilus_file_get_uri (NautilusFile *file)
-@@ -3053,7 +3093,8 @@
+@@ -3053,7 +3094,8 @@
  {
  	g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
  
@@ -67,7 +69,7 @@
  		return g_file_get_uri (file->details->activation_location);
  	}
  	
-@@ -3065,7 +3106,8 @@
+@@ -3065,7 +3107,8 @@
  {
  	g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
  
@@ -77,8 +79,9 @@
  		return g_object_ref (file->details->activation_location);
  	}
  	
---- nautilus-2.22.0/libnautilus-private/nautilus-mime-actions.c.old	2008-03-17 11:43:19.000000000 +0100
-+++ nautilus-2.22.0/libnautilus-private/nautilus-mime-actions.c	2008-03-17 11:43:33.000000000 +0100
+diff -Naur nautilus-2.22.0.old/libnautilus-private/nautilus-mime-actions.c nautilus-2.22.0/libnautilus-private/nautilus-mime-actions.c
+--- nautilus-2.22.0.old/libnautilus-private/nautilus-mime-actions.c	2008-03-19 16:04:39.000000000 +0100
++++ nautilus-2.22.0/libnautilus-private/nautilus-mime-actions.c	2008-03-19 16:04:48.000000000 +0100
 @@ -727,7 +727,8 @@
  {
    return (nautilus_file_is_directory (file) ||
@@ -89,8 +92,9 @@
  }
  
  static ActivationAction
---- nautilus-2.22.0/src/file-manager/fm-directory-view.c.old	2008-03-17 11:38:26.000000000 +0100
-+++ nautilus-2.22.0/src/file-manager/fm-directory-view.c	2008-03-17 11:45:40.000000000 +0100
+diff -Naur nautilus-2.22.0.old/src/file-manager/fm-directory-view.c nautilus-2.22.0/src/file-manager/fm-directory-view.c
+--- nautilus-2.22.0.old/src/file-manager/fm-directory-view.c	2008-03-19 16:04:39.000000000 +0100
++++ nautilus-2.22.0/src/file-manager/fm-directory-view.c	2008-03-19 16:04:48.000000000 +0100
 @@ -4264,9 +4264,11 @@
  
  		file = NAUTILUS_FILE (node->data);