From 295d432175292dbaef572093d784aab55f5c0b8f Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sat, 15 Dec 2018 17:09:38 +0100
Subject: passfile: directly read file instead of invoking cat

Allows better error handling, gets rid of the call to an
external program, and fixes https://github.com/rfjakob/gocryptfs/issues/278 .
---
 init_dir.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'init_dir.go')

diff --git a/init_dir.go b/init_dir.go
index 6bc977f..5d5cbc9 100644
--- a/init_dir.go
+++ b/init_dir.go
@@ -78,7 +78,7 @@ func initDir(args *argContainer) {
 			password = readpassword.Trezor(trezorPayload)
 		} else {
 			// Normal password entry
-			password = readpassword.Twice(args.extpass)
+			password = readpassword.Twice(args.extpass, args.passfile)
 			readpassword.CheckTrailingGarbage()
 		}
 		creator := tlog.ProgramName + " " + GitVersion
-- 
cgit v1.2.3