rpms/kdebase/F-9 kdebase-4.0.5-kdepasswd-ldap.patch, NONE, 1.1 kdebase.spec, 1.327, 1.328

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.0.5-kdepasswd-ldap.patch 
Log Message:
Avoid lockup after a failed login on LDAP systems (kdebug:161377)


kdebase-4.0.5-kdepasswd-ldap.patch:

--- NEW FILE kdebase-4.0.5-kdepasswd-ldap.patch ---
--- kdebase/apps/kdepasswd/passwd.cpp	2008/06/20 12:49:41	822500
+++ kdebase/apps/kdepasswd/passwd.cpp	2008/06/20 12:52:28	822501
@@ -156,6 +156,13 @@
 
 	case 2: 
 	    m_Error = "";
+            if( line.contains("again"))
+            {
+                m_Error = line;
+                kill(m_Pid, SIGKILL);
+                waitForChild();
+                return PasswordIncorrect;
+            }
 	    // Wait for second prompt.
 	    errline = line;  // use first line for error message
 	    while (!isPrompt(line, "new"))


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- kdebase.spec	24 Jun 2008 15:43:23 -0000	1.327
+++ kdebase.spec	2 Jul 2008 14:46:53 -0000	1.328
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -38,6 +38,8 @@
 # backporte from 4.1
 Patch103: kdebase-4.0.4-konqueror-updatehistoryentry.patch
 Patch104: kdebase-4.0.5-konq-memleak.patch
+#Â Avoid lockup after a failed login on LDAP systems (kdebug:161377)
+Patch105: kdebase-4.0.5-kdepasswd-ldap.patch
 
 BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -134,6 +136,7 @@
 %patch102 -p1 -b .kwrite-dt_categories
 %patch103 -p1 -b .konqueror-updatehistoryentry
 %patch104 -p1 -b .konq-memleak
+%patch105 -p1 -b .kdepasswd-ldap
 
 %build
 
@@ -312,6 +315,9 @@
 
 
 %changelog
+* Wed Jul  2 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.5-5
+- Avoid lockup after a failed login on LDAP systems (kdebug:161377)
+
 * Tue Jun 24 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.5-4
 - #426108: Add more directories to konqueror's default
   plugin search path list