2012-11-29 16:31:19

by Jesper Nilsson

Subject: [PATCH] cifs: Add handling of blank password option

The option to have a blank "pass=" already exists, and with
a password specified both "pass=%s" and "password=%s" are supported.
Also, both blank "user=" and "username=" are supported, making
"password=" the odd man out.

Signed-off-by: Jesper Nilsson <[email protected]>
---
fs/cifs/connect.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 5c670b9..c83f5b65 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -186,6 +186,7 @@ static const match_table_t cifs_mount_option_tokens = {
{ Opt_user, "user=%s" },
{ Opt_user, "username=%s" },
{ Opt_blank_pass, "pass=" },
+ { Opt_blank_pass, "password=" },
{ Opt_pass, "pass=%s" },
{ Opt_pass, "password=%s" },
{ Opt_blank_ip, "ip=" },
--
1.8.0.rc0.18.gf84667d


/^JN - Jesper Nilsson
--
Jesper Nilsson -- [email protected]

2012-11-29 16:56:38

by Steve French

Subject: Re: [PATCH] cifs: Add handling of blank password option

merged into cifs-2.6.git

On Thu, Nov 29, 2012 at 10:31 AM, Jesper Nilsson
<[email protected]> wrote:
> The option to have a blank "pass=" already exists, and with
> a password specified both "pass=%s" and "password=%s" are supported.
> Also, both blank "user=" and "username=" are supported, making
> "password=" the odd man out.
>
> Signed-off-by: Jesper Nilsson <[email protected]>
> ---
> fs/cifs/connect.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index 5c670b9..c83f5b65 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -186,6 +186,7 @@ static const match_table_t cifs_mount_option_tokens = {
> { Opt_user, "user=%s" },
> { Opt_user, "username=%s" },
> { Opt_blank_pass, "pass=" },
> + { Opt_blank_pass, "password=" },
> { Opt_pass, "pass=%s" },
> { Opt_pass, "password=%s" },
> { Opt_blank_ip, "ip=" },
> --
> 1.8.0.rc0.18.gf84667d
>
>
> /^JN - Jesper Nilsson
> --
> Jesper Nilsson -- [email protected]



--
Thanks,

Steve