* debian/patches/git-smartcard-crash.patch:
- Don't crash on login with a smartcard (LP: #1031034)
Fixes LP: #1031034
(bzr r344)
Michael Terry
11 years ago
| 25 | 25 |
* debian/patches/git_xrandr_explicitly_set_clone_state.patch:
|
| 26 | 26 |
- "xrandr; explicitly set clone state variable when generating monitor
|
| 27 | 27 |
configs" (LP: #1014533)
|
|
28 |
|
|
29 |
[ Michael Terry ]
|
|
30 |
* debian/patches/git-smartcard-crash.patch:
|
|
31 |
- Don't crash on login with a smartcard (LP: #1031034)
|
| 28 | 32 |
|
| 29 | 33 |
-- Sebastien Bacher <seb128@ubuntu.com> Tue, 19 Jun 2012 10:45:45 +0200
|
| 30 | 34 |
|
|
0 |
From fdfd97cd737257532c8797e2a551a10f5c74cf05 Mon Sep 17 00:00:00 2001
|
|
1 |
From: Michael Terry <michael.terry@canonical.com>
|
|
2 |
Date: Tue, 31 Jul 2012 11:54:51 -0400
|
|
3 |
Subject: [PATCH] [smartcard] Don't try to use smartcard drivers that didn't
|
|
4 |
load
|
|
5 |
|
|
6 |
https://bugzilla.gnome.org/show_bug.cgi?id=668950
|
|
7 |
---
|
|
8 |
plugins/smartcard/gsd-smartcard-manager.c | 8 ++++----
|
|
9 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
10 |
|
|
11 |
Index: gnome-settings-daemon-3.4.2/plugins/smartcard/gsd-smartcard-manager.c
|
|
12 |
===================================================================
|
|
13 |
--- gnome-settings-daemon-3.4.2.orig/plugins/smartcard/gsd-smartcard-manager.c 2012-04-12 05:54:01.000000000 -0400
|
|
14 |
+++ gnome-settings-daemon-3.4.2/plugins/smartcard/gsd-smartcard-manager.c 2012-07-31 12:06:17.612835667 -0400
|
|
15 |
@@ -731,8 +731,8 @@
|
|
16 |
g_free (module_spec);
|
|
17 |
module_spec = NULL;
|
|
18 |
|
|
19 |
- if (!SECMOD_HasRemovableSlots (module) ||
|
|
20 |
- !module->loaded) {
|
|
21 |
+ if (SECMOD_HasRemovableSlots (module) &&
|
|
22 |
+ module->loaded) {
|
|
23 |
modules = g_list_prepend (modules, module);
|
|
24 |
} else {
|
|
25 |
g_debug ("fallback module found but not %s",
|
|
26 |
@@ -767,8 +767,8 @@
|
|
27 |
g_free (module_spec);
|
|
28 |
module_spec = NULL;
|
|
29 |
|
|
30 |
- if (!SECMOD_HasRemovableSlots (module) ||
|
|
31 |
- !module->loaded) {
|
|
32 |
+ if (SECMOD_HasRemovableSlots (module) &&
|
|
33 |
+ module->loaded) {
|
|
34 |
modules = g_list_prepend (modules, module);
|
|
35 |
} else {
|
|
36 |
g_debug ("fallback module found but not loaded");
|
| 24 | 24 |
xsettings_signal_handling.patch
|
| 25 | 25 |
git-mask-out-virtual-modifiers.patch
|
| 26 | 26 |
git_xrandr_explicitly_set_clone_state.patch
|
|
27 |
git-smartcard-crash.patch
|