Merge lp:~wlxing/ecryptfs/lp1694272 into lp:ecryptfs

Proposed by Jason Xing on 2017-06-08
Status: Merged
Merged at revision: 892
Proposed branch: lp:~wlxing/ecryptfs/lp1694272
Merge into: lp:ecryptfs
Diff against target: 27 lines (+6/-0)
2 files modified
debian/changelog (+2/-0)
src/utils/ecryptfs-recover-private (+4/-0)
To merge this branch: bzr merge lp:~wlxing/ecryptfs/lp1694272
Reviewer Review Type Date Requested Status
Tyler Hicks 2017-06-08 Approve on 2017-06-08
Review via email: mp+325334@code.launchpad.net

Description of the Change

ecryptfs-recover-private will warn the user even if the private directory is mounted successfully (LP: #1694272, LP: #1439825)

To post a comment you must log in.
Tyler Hicks (tyhicks) wrote :

Thanks! This looked good to me but I did a little extra cleanup by adding a helper function for the WARNING messages and routed them to stderr.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-06-08 15:20:06 +0000
3+++ debian/changelog 2017-06-08 19:44:28 +0000
4@@ -32,6 +32,8 @@
5 are no options (LP: #1695767)
6 * src/utils/ecryptfs-mount-private, doc/manpage/ecryptfs-mount-private.1:
7 ecryptfs-mount-private -h prints short usage message (LP: #1449253)
8+ * src/utils/ecryptfs-recover-private: ecryptfs-recover-private will warn users
9+ even if the directory is mounted successfully (LP: #1694272, LP: #1439825)
10
11 -- Dustin Kirkland <kirkland@ubuntu.com> Fri, 26 Feb 2016 18:00:18 -0600
12
13
14=== modified file 'src/utils/ecryptfs-recover-private'
15--- src/utils/ecryptfs-recover-private 2013-12-04 04:55:04 +0000
16+++ src/utils/ecryptfs-recover-private 2017-06-08 19:44:28 +0000
17@@ -96,6 +96,10 @@
18 stty $stty_orig
19 echo
20 sigs=$(printf "%s\0" "$passphrase" | ecryptfs-add-passphrase $fnek | grep "^Inserted" | sed -e "s/^.*\[//" -e "s/\].*$//" -e "s/[^0-9a-f]//g")
21+ echo "WARNING: Unable to verify your mount passphrase. Your encrypted"
22+ echo "WARNING: directory will be mounted but your data will not be properly"
23+ echo "WARNING: decrypted if you entered an incorrect mount passphrase."
24+
25 fi
26 case $(echo "$sigs" | wc -l) in
27 1)

Subscribers

People subscribed via source and target branches