Change --pw-stdin to use getPassword()
#1686
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
phoerious
requested changes
Mar 8, 2018
share/translations/keepassx_ar.ts
Outdated
| @@ -4094,5 +4094,9 @@ Please unlock the selected database or choose another one which is unlocked.</so | |||
| <source>Parent window handle</source> | |||
| <translation>زر النافذة الأم</translation> | |||
| </message> | |||
| <message> | |||
There was a problem hiding this comment.
I've also updated the translation files and I'd like a thumbs up on that.
Please revert that. We will update translations before the release. There is no point in pulling them in now. They just convolute the PR.
src/main.cpp
Outdated
| @@ -148,7 +150,9 @@ int main(int argc, char** argv) | |||
| // we always need consume a line of STDIN if --pw-stdin is set to clear out the | |||
| // buffer for native messaging, even if the specified file does not exist | |||
| static QTextStream in(stdin, QIODevice::ReadOnly); | |||
| password = in.readLine(); | |||
| static QTextStream out(stdout, QIODevice::WriteOnly); | |||
| out << QCoreApplication::translate("Main", "Database password") << QString(": ") << flush; | |||
There was a problem hiding this comment.
The colon should be part of the translation string.
|
Also please rebase against release/2.3.2. |
|
Updated and rebased |
droidmonkey
added a commit
that referenced
this pull request
May 8, 2018
- Enable high entropy ASLR on Windows [#1747] - Enhance favicon fetching [#1786] - Fix crash on Windows due to autotype [#1691] - Fix dark tray icon changing all icons [#1680] - Fix --pw-stdin not using getPassword function [#1686] - Fix placeholders being resolved in notes [#1907] - Enable auto-type start delay to be configurable [#1908] - Browser: Fix native messaging reply size [#1719] - Browser: Increase maximum buffer size [#1720] - Browser: Enhance usability and functionality [#1810, #1822, #1830, #1884, #1906] - SSH Agent: Parse aes-256-cbc/ctr keys [#1682] - SSH Agent: Enhance usability and functionality [#1677, #1679, #1681, #1787]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make
--pw-stdinusegetPassword()instead ofreadLine()Description
A minor change to use the
getPassword()function from CLI.I've also updated the translation files and I'd like a thumbs up on that.
Motivation and context
Fixes #1673
How has this been tested?
Manual testing plus
make testScreenshots (if appropriate):
Types of changes
Checklist:
-DWITH_ASAN=ON. [REQUIRED]