From: Steve French <smfrench@gmail.com>
To: Petr Pavlu <petr.pavlu@suse.com>
Cc: Steve French <stfrench@microsoft.com>, CIFS <linux-cifs@vger.kernel.org>
Subject: Re: [PATCH] cifs: fix mount option display for sec=krb5i
Date: Mon, 10 Feb 2020 09:12:57 -0600 [thread overview]
Message-ID: <CAH2r5ms9mOFk3SwLaoXZtk7eyNL3PWZECEyz0+mzGBGzYJaURw@mail.gmail.com> (raw)
In-Reply-To: <20200210093814.24198-1-petr.pavlu@suse.com>
merged into cifs-2.6.git for-next
On Mon, Feb 10, 2020 at 3:40 AM Petr Pavlu <petr.pavlu@suse.com> wrote:
>
> Fix display for sec=krb5i which was wrongly interleaved by cruid,
> resulting in string "sec=krb5,cruid=<...>i" instead of
> "sec=krb5i,cruid=<...>".
>
> Fixes: 96281b9e46eb ("smb3: for kerberos mounts display the credential uid used")
> Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
> ---
> fs/cifs/cifsfs.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> index 5492b9860baa..92b9c8221f07 100644
> --- a/fs/cifs/cifsfs.c
> +++ b/fs/cifs/cifsfs.c
> @@ -414,7 +414,7 @@ cifs_show_security(struct seq_file *s, struct cifs_ses *ses)
> seq_puts(s, "ntlm");
> break;
> case Kerberos:
> - seq_printf(s, "krb5,cruid=%u", from_kuid_munged(&init_user_ns,ses->cred_uid));
> + seq_puts(s, "krb5");
> break;
> case RawNTLMSSP:
> seq_puts(s, "ntlmssp");
> @@ -427,6 +427,10 @@ cifs_show_security(struct seq_file *s, struct cifs_ses *ses)
>
> if (ses->sign)
> seq_puts(s, "i");
> +
> + if (ses->sectype == Kerberos)
> + seq_printf(s, ",cruid=%u",
> + from_kuid_munged(&init_user_ns, ses->cred_uid));
> }
>
> static void
> --
> 2.16.4
>
--
Thanks,
Steve
prev parent reply other threads:[~2020-02-10 15:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-10 9:38 [PATCH] cifs: fix mount option display for sec=krb5i Petr Pavlu
2020-02-10 15:12 ` Steve French [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAH2r5ms9mOFk3SwLaoXZtk7eyNL3PWZECEyz0+mzGBGzYJaURw@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=linux-cifs@vger.kernel.org \
--cc=petr.pavlu@suse.com \
--cc=stfrench@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.