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
372
	int val;
372
	int val;
6
373
	int value_retrieved;
373
	int value_retrieved;
7
374
	int i;
374
	int i;
9
375
	int rc;
375
	int rc = 0;
10
376
	int tries = 0;
376
	int tries = 0;
11
377
377
12
378
	if (ecryptfs_verbosity)
378
	if (ecryptfs_verbosity)
13
379
379
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
212
	"sig",
212
	"sig",
19
213
	"no_sig_cache",
213
	"no_sig_cache",
20
214
	"verbose",
214
	"verbose",
21
215
	"verbosity",
22
215
	"ecryptfs_enable_filename_crypto",
216
	"ecryptfs_enable_filename_crypto",
23
216
	NULL
217
	NULL
24
217
};
218
};
Status:	Merged
Approved by:	Dustin Kirkland  on 2009-04-30
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Dustin Kirkland 		2009-04-24	Approve on 2009-04-30
Review via email: mp+5845@code.staging.launchpad.net