gnome-keyring r1007 - in trunk: . common keyrings

[nnielsen svn gnome org]

Author: nnielsen
Date: Mon Jan 14 15:33:48 2008
New Revision: 1007
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1007&view=rev

Log:
	* Merged revisions 924 - 1006 from gnome-2-20 branch

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/common/gkr-secure-memory.c
   trunk/keyrings/gkr-keyring-item.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jan 14 15:33:48 2008
@@ -26,6 +26,12 @@
 * PAM module now works with SELinux
 * Add a simpler API for accessing and storing passwords.
 
+Changes in version 2.20.3 are:
+* Use correct environment to startup gnome-keyring-daemon from PAM.
+* Fix crash when comparing item attributes. [Sam Morris]
+* Fix crash on shutdown. [Jeff Cai]
+* Build fix for OpenBSD [Martynas Venckus]
+
 Changes in version 2.20.2 are:
 * Build fixes for systems that require GNU_SOURCE to be defined. [Christopher Taylor]
 * Builds with the latest DBus [Owen Taylor]

Modified: trunk/common/gkr-secure-memory.c
==============================================================================
--- trunk/common/gkr-secure-memory.c	(original)
+++ trunk/common/gkr-secure-memory.c	Mon Jan 14 15:33:48 2008
@@ -31,6 +31,7 @@
 
 #include "gkr-secure-memory.h"
 
+#include <sys/types.h>
 #include <sys/mman.h>
 #include <stddef.h>
 #include <string.h>

Modified: trunk/keyrings/gkr-keyring-item.c
==============================================================================
--- trunk/keyrings/gkr-keyring-item.c	(original)
+++ trunk/keyrings/gkr-keyring-item.c	Mon Jan 14 15:33:48 2008
@@ -226,12 +226,11 @@
 				}
 				switch (attribute->type) {
 				case GNOME_KEYRING_ATTRIBUTE_TYPE_STRING:
-					if ((attribute->value.string == NULL || item_attribute->value.string == NULL) && 
-					    attribute->value.string != item_attribute->value.string) {
-						return FALSE;
-					}
-					if (strcmp (attribute->value.string, item_attribute->value.string) != 0) {
-						return FALSE;
+					if (attribute->value.string != item_attribute->value.string) {
+						if (attribute->value.string == NULL || item_attribute->value.string == NULL)
+							return FALSE;
+						if (strcmp (attribute->value.string, item_attribute->value.string) != 0)
+							return FALSE;
 					}
 					break;
 				case GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32: