Merge fix from the '0.6.x' maintenance branch:

window: don't add encrypted prompts to input history
* Passwords are no longer added to the input history.

(git commit e5e61842c5bf610da1b4ceeb52e613dd911040b6)
This commit is contained in:
dcoppa 2015-02-23 10:16:48 +00:00
parent 0a8b6c13fd
commit e619f249f4
2 changed files with 21 additions and 2 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.28 2015/02/08 16:29:48 dcoppa Exp $ # $OpenBSD: Makefile,v 1.29 2015/02/23 10:16:48 dcoppa Exp $
COMMENT = ncurses mpd client inspired by ncmpc COMMENT = ncurses mpd client inspired by ncmpc
BROKEN-alpha = error: looser throw specifier for 'virtual OutOfBounds::~OutOfBounds() BROKEN-alpha = error: looser throw specifier for 'virtual OutOfBounds::~OutOfBounds()
BROKEN-hppa = bindings.h:85:4: error: type 'Binding' is not a direct base of 'Binding' BROKEN-hppa = bindings.h:85:4: error: type 'Binding' is not a direct base of 'Binding'
DISTNAME = ncmpcpp-0.6.2 DISTNAME = ncmpcpp-0.6.2
REVISION = 1 REVISION = 2
EXTRACT_SUFX = .tar.bz2 EXTRACT_SUFX = .tar.bz2

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_window_cpp,v 1.3 2015/02/23 10:16:48 dcoppa Exp $
commit e5e61842c5bf610da1b4ceeb52e613dd911040b6
Author: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu Feb 5 15:05:56 2015 +0100
window: don't add encrypted prompts to input history
--- src/window.cpp.orig Mon Feb 23 04:06:36 2015
+++ src/window.cpp Mon Feb 23 04:07:14 2015
@@ -820,7 +820,7 @@ std::string Window::getString(const std::string &base,
curs_set(0);
if (input != nullptr)
{
- if (input[0] != 0)
+ if (!encrypted && input[0] != 0)
add_history(input);
result = input;
free(input);