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

Proposed by Jason Xing
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 Approve
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.
Revision history for this message
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
=== modified file 'debian/changelog'
--- debian/changelog 2017-06-08 15:20:06 +0000
+++ debian/changelog 2017-06-08 19:44:28 +0000
@@ -32,6 +32,8 @@
32 are no options (LP: #1695767)32 are no options (LP: #1695767)
33 * src/utils/ecryptfs-mount-private, doc/manpage/ecryptfs-mount-private.1:33 * src/utils/ecryptfs-mount-private, doc/manpage/ecryptfs-mount-private.1:
34 ecryptfs-mount-private -h prints short usage message (LP: #1449253)34 ecryptfs-mount-private -h prints short usage message (LP: #1449253)
35 * src/utils/ecryptfs-recover-private: ecryptfs-recover-private will warn users
36 even if the directory is mounted successfully (LP: #1694272, LP: #1439825)
3537
36 -- Dustin Kirkland <kirkland@ubuntu.com> Fri, 26 Feb 2016 18:00:18 -060038 -- Dustin Kirkland <kirkland@ubuntu.com> Fri, 26 Feb 2016 18:00:18 -0600
3739
3840
=== modified file 'src/utils/ecryptfs-recover-private'
--- src/utils/ecryptfs-recover-private 2013-12-04 04:55:04 +0000
+++ src/utils/ecryptfs-recover-private 2017-06-08 19:44:28 +0000
@@ -96,6 +96,10 @@
96 stty $stty_orig96 stty $stty_orig
97 echo97 echo
98 sigs=$(printf "%s\0" "$passphrase" | ecryptfs-add-passphrase $fnek | grep "^Inserted" | sed -e "s/^.*\[//" -e "s/\].*$//" -e "s/[^0-9a-f]//g")98 sigs=$(printf "%s\0" "$passphrase" | ecryptfs-add-passphrase $fnek | grep "^Inserted" | sed -e "s/^.*\[//" -e "s/\].*$//" -e "s/[^0-9a-f]//g")
99 echo "WARNING: Unable to verify your mount passphrase. Your encrypted"
100 echo "WARNING: directory will be mounted but your data will not be properly"
101 echo "WARNING: decrypted if you entered an incorrect mount passphrase."
102
99 fi103 fi
100 case $(echo "$sigs" | wc -l) in104 case $(echo "$sigs" | wc -l) in
101 1)105 1)

Subscribers

People subscribed via source and target branches