rpms/plymouth/devel escape-sends-empty-password.patch, NONE, 1.1 plymouth.spec, 1.43, 1.44

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20231

Modified Files:
	plymouth.spec 
Added Files:
	escape-sends-empty-password.patch 
Log Message:
- If user hits escape, send "" as the password (bug 459111)


escape-sends-empty-password.patch:

--- NEW FILE escape-sends-empty-password.patch ---
commit e962a0bbd96bbec72f934a0f8053bd5c26dc21f4
Author: Ray Strode <rstrode at redhat.com>
Date:   Wed Aug 27 16:01:28 2008 -0400

    respond w/ "" if user hits esc to password prompt
    
    This is so when we load the next plugin it won't
    get confused.

diff --git a/src/plugins/splash/details/plugin.c b/src/plugins/splash/details/plugin.c
index 50e13ab..3706e81 100644
--- a/src/plugins/splash/details/plugin.c
+++ b/src/plugins/splash/details/plugin.c
@@ -205,6 +205,12 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 
   ply_trace ("hiding splash screen");
 
+  if (plugin->pending_password_answer != NULL)
+    {
+      ply_answer_with_string (plugin->pending_password_answer, "");
+      plugin->pending_password_answer = NULL;
+    }
+
   ply_window_set_keyboard_input_handler (window, NULL, NULL);
   ply_window_set_backspace_handler (window, NULL, NULL);
   ply_window_set_enter_handler (window, NULL, NULL);
diff --git a/src/plugins/splash/fade-in/plugin.c b/src/plugins/splash/fade-in/plugin.c
index 2641217..604c181 100644
--- a/src/plugins/splash/fade-in/plugin.c
+++ b/src/plugins/splash/fade-in/plugin.c
@@ -578,6 +578,12 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 {
   assert (plugin != NULL);
 
+  if (plugin->pending_password_answer != NULL)
+    {
+      ply_answer_with_string (plugin->pending_password_answer, "");
+      plugin->pending_password_answer = NULL;
+    }
+
   ply_window_set_keyboard_input_handler (window, NULL, NULL);
   ply_window_set_backspace_handler (window, NULL, NULL);
   ply_window_set_enter_handler (window, NULL, NULL);
diff --git a/src/plugins/splash/spinfinity/plugin.c b/src/plugins/splash/spinfinity/plugin.c
index 44d66cf..cd9a85b 100644
--- a/src/plugins/splash/spinfinity/plugin.c
+++ b/src/plugins/splash/spinfinity/plugin.c
@@ -387,6 +387,12 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 {
   assert (plugin != NULL);
 
+  if (plugin->pending_password_answer != NULL)
+    {
+      ply_answer_with_string (plugin->pending_password_answer, "");
+      plugin->pending_password_answer = NULL;
+    }
+
   ply_window_set_keyboard_input_handler (window, NULL, NULL);
   ply_window_set_backspace_handler (window, NULL, NULL);
   ply_window_set_enter_handler (window, NULL, NULL);
diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
index 11c2dc4..465d763 100644
--- a/src/plugins/splash/text/plugin.c
+++ b/src/plugins/splash/text/plugin.c
@@ -253,6 +253,12 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 
   ply_trace ("hiding splash screen");
 
+  if (plugin->pending_password_answer != NULL)
+    {
+      ply_answer_with_string (plugin->pending_password_answer, "");
+      plugin->pending_password_answer = NULL;
+    }
+
   ply_window_set_keyboard_input_handler (window, NULL, NULL);
   ply_window_set_backspace_handler (window, NULL, NULL);
   ply_window_set_enter_handler (window, NULL, NULL);


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- plymouth.spec	27 Aug 2008 18:13:23 -0000	1.43
+++ plymouth.spec	27 Aug 2008 20:09:12 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.08.27.1%{?dist}
+Release: 0.2008.08.27.2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@
 
 Patch0: plymouth-0.5.0-textbar-hotness.patch
 Patch1: fix-text-plugin-crasher.patch
+Patch2: fix-text-plugin-crasher.patch
 
 Obsoletes: rhgb < 1:10.0.0
 Provides: rhgb = 1:10.0.0
@@ -108,6 +109,7 @@
 %setup -q
 %patch0 -p1 -b .textbar
 %patch1 -p1 -b .fix-text-plugin-crasher
+%patch2 -p1 -b .escape-sends-empty-password
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -228,6 +230,9 @@
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Wed Aug 27 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.08.27.2
+- If user hits escape, send "" as the password (bug 459111)
+
 * Wed Aug 27 2008 Ray Strode <rstrode at redhat.com> 0.5.0-0.2008.08.27.1
 - Fix another crasher for users with encrypted disks (this time in
   the text plugin, not the client)