Fix kdesktop_lock crash on error with certain PAM stack configurations

tdmlib/kgreet_classic.cpp

@@ -485,22 +485,32 @@ KClassicGreeter::revive()
 	// assert(!running);
 	setActive2(true);
 	if (authTok) {
+		if (passwd1Edit) {
 			passwd1Edit->erase();
+		}
+		if (passwd2Edit) {
 			passwd2Edit->erase();
+		}
+		if (passwd1Edit) {
 			passwd1Edit->setFocus();
-	} else {
+		}
+	}
+	else {
 		passwdEdit->erase();
-		if (loginEdit && loginEdit->isEnabled())
+		if (loginEdit && loginEdit->isEnabled()) {
 			passwdEdit->setEnabled( true );
+		}
 		else {
 			setActive( true );
-			if (loginEdit && loginEdit->text().isEmpty())
+			if (loginEdit && loginEdit->text().isEmpty()) {
 				loginEdit->setFocus();
-			else
+			}
+			else {
 				passwdEdit->setFocus();
 			}
 		}
 	}
+}
 
 void // virtual
 KClassicGreeter::clear()