← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnome-keyring/natty

« back to all changes in this revision

Viewing changes to debian/patches/10_git_fix_cka_trusted_collections.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-12-06 17:58:28 UTC
  • mfrom: (1.1.65 upstream)
  • Revision ID: james.westby@ubuntu.com-20101206175828-8xjojyxw89qacpq7
Tags: 2.92.92.is.2.32.1-0ubuntu1
* New upstream version
* debian/control.in:
  - updated the libglib requirement
* debian/libgcr0.symbols:
  - new version update
* debian/patches/02_uidir_relocate.patch:
  - updated for the new version
* debian/patches/10_git_fix_cka_trusted_collections.patch:
  - dropped, the patch is the new version
* debian/patches/90_git_pam_headers.patch:
  - dropped, the patch is the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/10_git_fix_cka_trusted_collections.patch
1
 
diff -Nur -x '*.orig' -x '*~' gnome-keyring-2.92.92.is.2.31.91//pkcs11/secret-store/gkm-secret-collection.c gnome-keyring-2.92.92.is.2.31.91.new//pkcs11/secret-store/gkm-secret-collection.c
2
 
--- gnome-keyring-2.92.92.is.2.31.91//pkcs11/secret-store/gkm-secret-collection.c       2010-06-24 03:27:23.000000000 +0100
3
 
+++ gnome-keyring-2.92.92.is.2.31.91.new//pkcs11/secret-store/gkm-secret-collection.c   2010-09-30 18:30:40.259624006 +0100
4
 
@@ -414,7 +414,7 @@
5
 
                g_return_val_if_fail (identifier, CKR_GENERAL_ERROR);
6
 
                return gkm_attribute_set_bool (attr, g_str_equal (identifier, "login"));
7
 
        case CKA_TRUSTED:
8
 
-               if (self->sdata)
9
 
+               if (!self->sdata)
10
 
                        return gkm_attribute_set_bool (attr, CK_FALSE);
11
 
                master = gkm_secret_data_get_master (self->sdata);
12
 
                return gkm_attribute_set_bool (attr, (master && !gkm_secret_is_trivially_weak (master)));