diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-02-25 01:11:56 -0600 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-04-12 00:42:06 +0000 |
| commit | 8727c8a85f3951ef0eef36a665f5dceebb4c495d (patch) | |
| tree | f35b215604127ebb05a977a1b8c093b7b441b6af /fs/cifs/cifs_spnego.c | |
| parent | bdf1b03e093bdbc571f404e751c7b0e2dca412ea (diff) | |
| download | talos-op-linux-8727c8a85f3951ef0eef36a665f5dceebb4c495d.tar.gz talos-op-linux-8727c8a85f3951ef0eef36a665f5dceebb4c495d.zip | |
Allow user names longer than 32 bytes
We artificially limited the user name to 32 bytes, but modern servers handle
larger. Set the maximum length to a reasonable 256, and make the user name
string dynamically allocated rather than a fixed size in session structure.
Also clean up old checkpatch warning.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c index 4dfba8283165..33d221394aca 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/cifs/cifs_spnego.c @@ -113,7 +113,7 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo) MAX_MECH_STR_LEN + UID_KEY_LEN + (sizeof(uid_t) * 2) + CREDUID_KEY_LEN + (sizeof(uid_t) * 2) + - USER_KEY_LEN + strlen(sesInfo->userName) + + USER_KEY_LEN + strlen(sesInfo->user_name) + PID_KEY_LEN + (sizeof(pid_t) * 2) + 1; spnego_key = ERR_PTR(-ENOMEM); @@ -153,7 +153,7 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo) sprintf(dp, ";creduid=0x%x", sesInfo->cred_uid); dp = description + strlen(description); - sprintf(dp, ";user=%s", sesInfo->userName); + sprintf(dp, ";user=%s", sesInfo->user_name); dp = description + strlen(description); sprintf(dp, ";pid=0x%x", current->pid); |
