diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-22 08:08:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-22 08:08:25 -0700 |
commit | 75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4 (patch) | |
tree | b9080999d2fbe38aa1242ac4b838e17ebf1ed656 /fs/cifs/cifs_spnego.c | |
parent | a0abb93bf9dc590b031a1123f3e6c6c225c1cdd1 (diff) | |
parent | 0a891adccc867c28b022128bc342a779e476c816 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6tip-x86-vdso-2008-05-26_08_54_Montip-x86-scratch-2008-05-26_08_54_Montip-x86-resumetrace-2008-05-26_08_54_Montip-x86-i8259-2008-05-26_08_53_Montip-x86-checkme-2008-05-26_08_53_Montip-x86-bitops-2008-05-26_08_53_Montip-x86-apm-2008-05-26_08_53_Montip-timers-posixtimers-2008-05-26_08_52_Montip-timers-clockevents-2008-05-26_08_52_Montip-scratch-2008-05-26_08_52_Montip-sched-devel-2008-05-26_08_52_Montip-out-of-tree-2008-05-26_08_52_Montip-core-urgent-2008-05-26_08_52_Montip-core-stacktrace-2008-05-26_08_52_Montip-core-softlockup-2008-05-26_08_52_Montip-core-softirq-2008-05-26_08_52_Montip-core-rodata-2008-05-26_08_52_Montip-core-printk-2008-05-26_08_52_Montip-core-percpu-2008-05-26_08_52_Montip-core-checkme-2008-05-26_08_52_Montip-checkme-2008-05-26_08_52_Mon
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Fix reversed memset arguments
Adds username in the upcall key for unattended mounts with keytab
[CIFS] Remove redundant NULL check
Diffstat (limited to 'fs/cifs/cifs_spnego.c')
-rw-r--r-- | fs/cifs/cifs_spnego.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c index 6653e29637a7..7013aaff6aed 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/cifs/cifs_spnego.c @@ -119,6 +119,9 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo) dp = description + strlen(description); sprintf(dp, ";uid=0x%x", sesInfo->linux_uid); + dp = description + strlen(description); + sprintf(dp, ";user=%s", sesInfo->userName); + cFYI(1, ("key description = %s", description)); spnego_key = request_key(&cifs_spnego_key_type, description, ""); |