Merge branch 'upstream-fixes' into upstream

[linux-2.6] / fs / cifs / ntlmssp.c

diff --git a/fs/cifs/ntlmssp.c b/fs/cifs/ntlmssp.c
index 4aabe2d7cb7b673e59bd11f214a7b76acc69c873..115359cc7a32ce6cb5332435688bcaba5ee56397 100644 (file)
--- a/fs/cifs/ntlmssp.c
+++ b/fs/cifs/ntlmssp.c
@@ -121,9 +121,22 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, const int type,
        }
 
 
-/*     rc = SendReceive2(xid, ses, iov, num_iovecs, &resp_buf_type, 0); */
+       /* copy session key */
+
+       /* if Unicode, align strings to two byte boundary */
+
+       /* copy user name */ /* BB Do we need to special case null user name? */
+
+       /* copy domain name */
 
-       cifs_small_buf_release(smb_buffer);
+       /* copy Linux version */
+
+       /* copy network operating system name */
+
+       /* update bcc and smb buffer length */
+
+/*     rc = SendReceive2(xid, ses, iov, num_iovecs, &resp_buf_type, 0); */
+       /* SMB request buf freed in SendReceive2 */
 
        return rc;
 }