| From 468708b8b1f09be4947c81dcb3d76e1568b864db Mon Sep 17 00:00:00 2001 |
| From: Petr Pavlu <petr.pavlu@suse.com> |
| Date: Mon, 10 Feb 2020 10:38:14 +0100 |
| Subject: [PATCH] cifs: fix mount option display for sec=krb5i |
| |
| commit 3f6166aaf19902f2f3124b5426405e292e8974dd upstream. |
| |
| 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> |
| Signed-off-by: Steve French <stfrench@microsoft.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c |
| index bd34ea0d27e9..dd19556c835f 100644 |
| --- a/fs/cifs/cifsfs.c |
| +++ b/fs/cifs/cifsfs.c |
| @@ -376,7 +376,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"); |
| @@ -389,6 +389,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.7.4 |
| |
