summaryrefslogtreecommitdiff
path: root/fs/cifs/sess.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-06-23 02:33:48 +0000
committerSteve French <sfrench@us.ibm.com>2006-06-23 02:33:48 +0000
commit189acaaef81b1d71aedd0d28810de24160c2e781 (patch)
tree7360484f3e255557641053f170ab324572d4b855 /fs/cifs/sess.c
parent75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d (diff)
[CIFS] Enable sec flags on mount for cifs (part one)
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/sess.c')
-rw-r--r--fs/cifs/sess.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index c039b54206aa..70e32a81c213 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -33,8 +33,6 @@
extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8,
unsigned char *p24);
-#ifdef CONFIG_CIFS_EXPERIMENTAL
-
static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB)
{
__u32 capabilities = 0;
@@ -319,7 +317,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
__u32 capabilities;
int count;
int resp_buf_type = 0;
- struct kvec iov[1];
+ struct kvec iov[2]; /* BB split variable length info into 2nd iovec */
enum securityEnum type;
__u16 action;
int bytes_remaining;
@@ -489,7 +487,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
}
action = le16_to_cpu(pSMB->resp.Action);
if (action & GUEST_LOGIN)
- cFYI(1, (" Guest login")); /* BB mark SesInfo struct? */
+ cFYI(1, ("Guest login")); /* BB mark SesInfo struct? */
ses->Suid = smb_buf->Uid; /* UID left in wire format (le) */
cFYI(1, ("UID = %d ", ses->Suid));
/* response can have either 3 or 4 word count - Samba sends 3 */
@@ -525,4 +523,3 @@ ssetup_exit:
return rc;
}
-#endif /* CONFIG_CIFS_EXPERIMENTAL */