git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
fs
/
cifs
/
cifsencrypt.c
diff --git
a/fs/cifs/cifsencrypt.c
b/fs/cifs/cifsencrypt.c
index
45c3f78
..
5a0ee7f
100644
(file)
--- a/
fs/cifs/cifsencrypt.c
+++ b/
fs/cifs/cifsencrypt.c
@@
-184,7
+184,7
@@
int cifs_verify_signature(struct smb_hdr *cifs_pdu,
if (cifs_pdu == NULL || server == NULL)
return -EINVAL;
if (cifs_pdu == NULL || server == NULL)
return -EINVAL;
- if (
cifs_pdu->Command == SMB_COM_NEGOTIATE
)
+ if (
!server->session_estab
)
return 0;
if (cifs_pdu->Command == SMB_COM_LOCKING_ANDX) {
return 0;
if (cifs_pdu->Command == SMB_COM_LOCKING_ANDX) {
@@
-229,7
+229,7
@@
int cifs_verify_signature(struct smb_hdr *cifs_pdu,
}
/* first calculate 24 bytes ntlm response and then 16 byte session key */
}
/* first calculate 24 bytes ntlm response and then 16 byte session key */
-int setup_ntlm_response(struct cifs
SesInfo
*ses)
+int setup_ntlm_response(struct cifs
_ses
*ses)
{
int rc = 0;
unsigned int temp_len = CIFS_SESS_KEY_SIZE + CIFS_AUTH_RESP_SIZE;
{
int rc = 0;
unsigned int temp_len = CIFS_SESS_KEY_SIZE + CIFS_AUTH_RESP_SIZE;
@@
-312,7
+312,7
@@
int calc_lanman_hash(const char *password, const char *cryptkey, bool encrypt,
* Allocate domain name which gets freed when session struct is deallocated.
*/
static int
* Allocate domain name which gets freed when session struct is deallocated.
*/
static int
-build_avpair_blob(struct cifs
SesInfo
*ses, const struct nls_table *nls_cp)
+build_avpair_blob(struct cifs
_ses
*ses, const struct nls_table *nls_cp)
{
unsigned int dlen;
unsigned int wlen;
{
unsigned int dlen;
unsigned int wlen;
@@
-400,7
+400,7
@@
build_avpair_blob(struct cifsSesInfo *ses, const struct nls_table *nls_cp)
* about target string i.e. for some, just user name might suffice.
*/
static int
* about target string i.e. for some, just user name might suffice.
*/
static int
-find_domain_name(struct cifs
SesInfo
*ses, const struct nls_table *nls_cp)
+find_domain_name(struct cifs
_ses
*ses, const struct nls_table *nls_cp)
{
unsigned int attrsize;
unsigned int type;
{
unsigned int attrsize;
unsigned int type;
@@
-445,7
+445,7
@@
find_domain_name(struct cifsSesInfo *ses, const struct nls_table *nls_cp)
return 0;
}
return 0;
}
-static int calc_ntlmv2_hash(struct cifs
SesInfo
*ses, char *ntlmv2_hash,
+static int calc_ntlmv2_hash(struct cifs
_ses
*ses, char *ntlmv2_hash,
const struct nls_table *nls_cp)
{
int rc = 0;
const struct nls_table *nls_cp)
{
int rc = 0;
@@
-527,7
+527,7
@@
calc_exit_2:
}
static int
}
static int
-CalcNTLMv2_response(const struct cifs
SesInfo
*ses, char *ntlmv2_hash)
+CalcNTLMv2_response(const struct cifs
_ses
*ses, char *ntlmv2_hash)
{
int rc;
unsigned int offset = CIFS_SESS_KEY_SIZE + 8;
{
int rc;
unsigned int offset = CIFS_SESS_KEY_SIZE + 8;
@@
-563,7
+563,7
@@
CalcNTLMv2_response(const struct cifsSesInfo *ses, char *ntlmv2_hash)
int
int
-setup_ntlmv2_rsp(struct cifs
SesInfo
*ses, const struct nls_table *nls_cp)
+setup_ntlmv2_rsp(struct cifs
_ses
*ses, const struct nls_table *nls_cp)
{
int rc;
int baselen;
{
int rc;
int baselen;
@@
-649,7
+649,7
@@
setup_ntlmv2_rsp_ret:
}
int
}
int
-calc_seckey(struct cifs
SesInfo
*ses)
+calc_seckey(struct cifs
_ses
*ses)
{
int rc;
struct crypto_blkcipher *tfm_arc4;
{
int rc;
struct crypto_blkcipher *tfm_arc4;