Blame kdebase-4.3.4-bz#609039-chfn-parse.patch
|
 |
a7755d8 |
diff -up kdebase-4.5.1/apps/kdepasswd/kcm/chfnprocess.cpp.orig kdebase-4.5.1/apps/kdepasswd/kcm/chfnprocess.cpp
|
|
|
a7755d8 |
--- kdebase-4.5.1/apps/kdepasswd/kcm/chfnprocess.cpp.orig 2010-09-29 18:28:02.000000000 +0200
|
|
|
a7755d8 |
+++ kdebase-4.5.1/apps/kdepasswd/kcm/chfnprocess.cpp 2010-09-30 14:39:38.000000000 +0200
|
|
|
a7755d8 |
@@ -63,19 +63,16 @@ int ChfnProcess::ConverseChfn(const char
|
|
|
a7755d8 |
break;
|
|
|
a7755d8 |
}
|
|
|
a7755d8 |
|
|
|
a7755d8 |
- if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ )
|
|
|
a7755d8 |
+ if ( line.contains( "Changing finger info" ) )
|
|
|
a7755d8 |
+ {
|
|
|
a7755d8 |
+ // do nothing
|
|
|
a7755d8 |
+ }
|
|
|
a7755d8 |
+ else if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ )
|
|
|
a7755d8 |
{
|
|
|
a7755d8 |
WaitSlave();
|
|
|
a7755d8 |
write(fd(), pass, strlen(pass));
|
|
|
a7755d8 |
write(fd(), "\n", 1);
|
|
|
a7755d8 |
}
|
|
|
a7755d8 |
-
|
|
|
a7755d8 |
- line = readLine(); // Let's see what the outcome was
|
|
|
a7755d8 |
-
|
|
|
a7755d8 |
- if ( line.contains( "Changing finger info" ) )
|
|
|
a7755d8 |
- {
|
|
|
a7755d8 |
- // do nothing
|
|
|
a7755d8 |
- }
|
|
|
a7755d8 |
else if ( line.contains( "information changed" ) )
|
|
|
a7755d8 |
{
|
|
|
a7755d8 |
status=0;
|
|
|
a7755d8 |
@@ -86,7 +83,7 @@ int ChfnProcess::ConverseChfn(const char
|
|
|
a7755d8 |
status=0;
|
|
|
a7755d8 |
break;
|
|
|
a7755d8 |
}
|
|
|
a7755d8 |
- else if ( line.contains( "Password error" ) || line.contains("Incorrect password") )
|
|
|
a7755d8 |
+ else if ( line.contains( "Password error" ) || line.contains("Incorrect password") || line.contains("Authentication failure") )
|
|
|
a7755d8 |
{
|
|
|
a7755d8 |
status=PasswordError;
|
|
|
a7755d8 |
break;
|