On Mon, Dec 31, 2007 at 01:15:36AM -0600, Trevor Highland wrote:
> When configuring mount options eCryptfs is not prompting for
> passthrough support.  This patch fixes it.

In addition, all mount options directed at eCryptfs should be prefixed
with ecryptfs_. The README is already updated with this info. I
committed a modified version of this patch to GIT.

Thanks,
Mike

> From 153d8c23a8ce3471f2fde0b08e6b0c1bd5e03726 Mon Sep 17 00:00:00 2001
> From: Trevor Highland <[EMAIL PROTECTED](none)>
> Date: Mon, 31 Dec 2007 01:12:21 -0600
> Subject: [PATCH] fix version support to work with decision graph
> 
> ---
>  src/libecryptfs/module_mgr.c |   20 ++++++++++++++++++--
>  1 files changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/src/libecryptfs/module_mgr.c b/src/libecryptfs/module_mgr.c
> index 89e82da..47e69bb 100644
> --- a/src/libecryptfs/module_mgr.c
> +++ b/src/libecryptfs/module_mgr.c
> @@ -136,6 +136,22 @@ static int get_encrypted_passthrough(struct ecryptfs_ctx 
> *ctx,
>       return 0;
>  }
>  
> +static struct param_node ecryptfs_version_support_node = {
> +     .num_mnt_opt_names = 1,
> +     .mnt_opt_names = {"end"},
> +     .prompt = "end",
> +     .val_type = VAL_STR,
> +     .val = NULL,
> +     .display_opts = NULL,
> +     .default_val = NULL,
> +     .flags = ECRYPTFS_PARAM_FLAG_NO_VALUE,
> +     .num_transitions = 1,
> +     .tl = {{.val = "default",
> +             .pretty_val = "default",
> +             .next_token = NULL,
> +             .trans_func = NULL}}
> +};
> +
>  static struct param_node end_param_node = {
>       .num_mnt_opt_names = 1,
>       .mnt_opt_names = {"end"},
> @@ -296,7 +312,7 @@ static int init_ecryptfs_key_bytes_param_node(char 
> *cipher_name)
>                               }
>                               rc = 0;
>                       }
> -                     tn->next_token = &end_param_node;
> +                     tn->next_token = &ecryptfs_version_support_node;
>                       tn->trans_func = tf_ecryptfs_key_bytes;
>                       ecryptfs_key_bytes_param_node.num_transitions++;
>               }
> @@ -506,7 +522,7 @@ static int
>  fill_in_decision_graph_based_on_version_support(struct param_node *root,
>                                               uint32_t version)
>  {
> -     struct param_node *last_param_node = &ecryptfs_key_bytes_param_node;
> +     struct param_node *last_param_node = &end_param_node1;
>       int rc;
>  
>       ecryptfs_set_exit_param_on_graph(root, &another_key_param_node);

> -------------------------------------------------------------------------
> This SF.net email is sponsored by: Microsoft
> Defy all challenges. Microsoft(R) Visual Studio 2005.
> http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
> _______________________________________________
> eCryptfs-devel mailing list
> eCryptfs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/ecryptfs-devel

Attachment: pgp9pycn0r2gA.pgp
Description: PGP signature

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
eCryptfs-devel mailing list
eCryptfs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ecryptfs-devel

Reply via email to