patches/gnome-vfs-12-vfsinfo-crash.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 11608 30989571fd22
child 20216 87c403e99dad
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446

--- gnome-vfs-2.21.90/programs/gnomevfs-info.c.orig	2008-02-07 09:30:17.904787000 +0100
+++ gnome-vfs-2.21.90/programs/gnomevfs-info.c	2008-02-07 09:36:38.887962000 +0100
@@ -79,16 +79,16 @@
 		GnomeVFSACLKind  kind;
 		GnomeVFSACE     *ace;
 		GnomeVFSACLPerm *perms;
-		gboolean         negative;
-		gboolean         inherit;
+		gint             type;
+		gint             inherance;
 		char            *id;
 		const char      *kind_str;
 		
 		ace = GNOME_VFS_ACE (iter->data);
 		
 		kind = GNOME_VFS_ACL_KIND_NULL;
-		inherit = FALSE;
-		negative = FALSE;
+		inherance = 0;
+		type = 0;
 		id = "";
 		perms = NULL;
 		
@@ -96,8 +96,8 @@
 		              "kind", &kind, 
 		              "id", &id,
 		              "permissions", &perms,
-		              "negative", &negative,
-		              "inherit", &inherit,
+		              "type", &type,
+		              "inherance", &inherance,
 		              NULL);
 	
 		kind_str = gnome_vfs_acl_kind_to_string (kind);
@@ -106,7 +106,8 @@
 			continue;	
 		}
 		
-		printf ("                  : %s:%s:", kind_str, id);
+		printf ("                  : %s:%s:", kind_str, id ? id : "");
+
 		
 		if (perms != NULL) {
 			GnomeVFSACLPerm *piter;
@@ -118,14 +119,8 @@
 			}	
 		}
 		
-		if (inherit || negative) {
-			if (inherit && negative) {
-				printf (" (negative, inherit)");
-			} else {
-				printf (" (%s)", negative ? "negative" : "inherit");	
-			}
-		}
-		
+		printf ("type: %s ", gnome_vfs_acl_type_to_string(type));
+		printf ("inherance: %s", gnome_vfs_acl_inherance_to_string(inherance));
 		printf ("\n");
 	}