eCryptfs

Merge lp://staging/~mhlavink/ecryptfs/20090424 into lp://staging/~ecryptfs/ecryptfs/ecryptfs-utils

  1. 20090424
  2. Merge into ecryptfs-utils
Proposed by Michal Hlavinka
Status: Merged
Approved by: Dustin Kirkland 
Approved revision: 386
Merge reported by: Dustin Kirkland 
Merged at revision: not available
Proposed branch: lp://staging/~mhlavink/ecryptfs/20090424
Merge into: lp://staging/~ecryptfs/ecryptfs/ecryptfs-utils
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~mhlavink/ecryptfs/20090424
Reviewer Review Type Date Requested Status
Dustin Kirkland  Approve
Review via email: mp+5845@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Dustin Kirkland  (kirkland) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/libecryptfs/decision_graph.c'
2--- src/libecryptfs/decision_graph.c 2009-04-21 19:50:44 +0000
3+++ src/libecryptfs/decision_graph.c 2009-04-23 16:31:05 +0000
4@@ -372,7 +372,7 @@
5 int val;
6 int value_retrieved;
7 int i;
8- int rc;
9+ int rc = 0;
10 int tries = 0;
11
12 if (ecryptfs_verbosity)
13
14=== modified file 'src/utils/mount.ecryptfs.c'
15--- src/utils/mount.ecryptfs.c 2009-04-21 19:23:03 +0000
16+++ src/utils/mount.ecryptfs.c 2009-04-23 13:14:33 +0000
17@@ -212,6 +212,7 @@
18 "sig",
19 "no_sig_cache",
20 "verbose",
21+ "verbosity",
22 "ecryptfs_enable_filename_crypto",
23 NULL
24 };

Subscribers

People subscribed via source and target branches