From dc4521ddf3d02b42daf420cc7fec76413785db79 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 9 Oct 2012 11:58:57 +0200
Subject: Restore exclusivity of options in multiline/echo check.

---
 src/password-store.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/password-store.sh b/src/password-store.sh
index 55ed86e..eabbb50 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -244,7 +244,7 @@ case "$command" in
 			--) shift; break ;;
 		esac done
 
-		if [[ $err -ne 0 || $# -ne 1 ]]; then
+		if [[ $err -ne 0 || ( $multiline -eq 1 && $noecho -eq 0 ) || $# -ne 1 ]]; then
 			echo "Usage: $program $command [--echo,-e | --multiline,-m] [--force,-f] pass-name"
 			exit 1
 		fi
-- 
cgit v1.2.3