cifs: fix mount option display for sec=krb5i
commit3f6166aaf1
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:96281b9e46
("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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
db5a68ffad
commit
51a610a5c8
|
@ -414,7 +414,7 @@ cifs_show_security(struct seq_file *s, struct cifs_ses *ses)
|
||||||
seq_puts(s, "ntlm");
|
seq_puts(s, "ntlm");
|
||||||
break;
|
break;
|
||||||
case Kerberos:
|
case Kerberos:
|
||||||
seq_printf(s, "krb5,cruid=%u", from_kuid_munged(&init_user_ns,ses->cred_uid));
|
seq_puts(s, "krb5");
|
||||||
break;
|
break;
|
||||||
case RawNTLMSSP:
|
case RawNTLMSSP:
|
||||||
seq_puts(s, "ntlmssp");
|
seq_puts(s, "ntlmssp");
|
||||||
|
@ -427,6 +427,10 @@ cifs_show_security(struct seq_file *s, struct cifs_ses *ses)
|
||||||
|
|
||||||
if (ses->sign)
|
if (ses->sign)
|
||||||
seq_puts(s, "i");
|
seq_puts(s, "i");
|
||||||
|
|
||||||
|
if (ses->sectype == Kerberos)
|
||||||
|
seq_printf(s, ",cruid=%u",
|
||||||
|
from_kuid_munged(&init_user_ns, ses->cred_uid));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue