summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-10-02 20:09:00 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-10-02 20:09:00 -0500
commit53a3032775f4c0a9fb5a70bec74d8fd9906744e1 (patch)
tree899f4d4985167db5f290132801d06476c3c69efe
parent37b6d0d80ff63156326d46ba1e0a19f3b7c02e5b (diff)
downloadtdebase-53a3032775f4c0a9fb5a70bec74d8fd9906744e1.tar.gz
tdebase-53a3032775f4c0a9fb5a70bec74d8fd9906744e1.zip
Fix corner case where the classic greeter could get stuck on a PIN prompt
-rw-r--r--tdmlib/kgreet_classic.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tdmlib/kgreet_classic.cpp b/tdmlib/kgreet_classic.cpp
index bb968d4c1..d22f6979f 100644
--- a/tdmlib/kgreet_classic.cpp
+++ b/tdmlib/kgreet_classic.cpp
@@ -342,7 +342,8 @@ KClassicGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
}
else {
TQString pr( prompt );
- if (pr.find( TQRegExp( "\\bpassword\\b", false ) ) >= 0) {
+ if ((pr.find( TQRegExp( "\\bpassword\\b", false ) ) >= 0)
+ || (pr.find( TQRegExp( "\\bPIN\\b", false ) ) >= 0)) {
if (pr.find( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b",
false ) ) >= 0)
exp = 3;