diff options
| author | Igor Mammedov <niallan@gmail.com> | 2007-11-08 16:13:31 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-11-08 16:13:31 +0000 |
| commit | 9eae8a8903c3d90283d338fad2cc58f2eb90adcb (patch) | |
| tree | 69427c6fe09b8ee7c313c9b97887a98ee84a49dd /fs/cifs/cifs_spnego.c | |
| parent | 63d2583f5a1a0b72fea3f2171f23f0ca8fa556ec (diff) | |
| download | linux-stable-9eae8a8903c3d90283d338fad2cc58f2eb90adcb.tar.gz linux-stable-9eae8a8903c3d90283d338fad2cc58f2eb90adcb.tar.bz2 linux-stable-9eae8a8903c3d90283d338fad2cc58f2eb90adcb.zip | |
[CIFS] Add uid to key description so krb can handle user mounts
Adds uid to key description fro supporting user mounts
and minor formating changes
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Igor Mammedov <niallain@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifs_spnego.c')
| -rw-r--r-- | fs/cifs/cifs_spnego.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c index e142faf2d0ae..ad54a3a6e434 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/cifs/cifs_spnego.c @@ -76,9 +76,10 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo, const char *hostname) struct key *spnego_key; - /* version + ;ip{4|6}= + address + ;host=hostname + ;sec= + NULL */ - desc_len = 2 + 5 + 32 + 1 + 5 + strlen(hostname) + - strlen(";sec=krb5") + 1; + /* version + ;ip{4|6}= + address + ;host=hostname + + ;sec= + ;uid= + NULL */ + desc_len = 4 + 5 + 32 + 1 + 5 + strlen(hostname) + + strlen(";sec=krb5") + 7 + sizeof(uid_t)*2 + 1; spnego_key = ERR_PTR(-ENOMEM); description = kzalloc(desc_len, GFP_KERNEL); if (description == NULL) @@ -87,7 +88,7 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo, const char *hostname) dp = description; /* start with version and hostname portion of UNC string */ spnego_key = ERR_PTR(-EINVAL); - sprintf(dp, "%2.2x;host=%s;", CIFS_SPNEGO_UPCALL_VERSION, + sprintf(dp, "0x%2.2x;host=%s;", CIFS_SPNEGO_UPCALL_VERSION, hostname); dp = description + strlen(description); @@ -109,6 +110,9 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo, const char *hostname) else goto out; + dp = description + strlen(description); + sprintf(dp, ";uid=0x%x", sesInfo->linux_uid); + cFYI(1, ("key description = %s", description)); spnego_key = request_key(&cifs_spnego_key_type, description, ""); |