summaryrefslogtreecommitdiffstats
path: root/sys/netsmb/smb_smb.c
diff options
context:
space:
mode:
authoralfred <alfred@FreeBSD.org>2003-01-21 08:56:16 +0000
committeralfred <alfred@FreeBSD.org>2003-01-21 08:56:16 +0000
commitbf8e8a6e8f0bd9165109f0a258730dd242299815 (patch)
treef16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/netsmb/smb_smb.c
parent2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff)
downloadFreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip
FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/netsmb/smb_smb.c')
-rw-r--r--sys/netsmb/smb_smb.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/netsmb/smb_smb.c b/sys/netsmb/smb_smb.c
index b5e7c22..6a24de6 100644
--- a/sys/netsmb/smb_smb.c
+++ b/sys/netsmb/smb_smb.c
@@ -280,8 +280,8 @@ again:
error = smb_rq_alloc(VCTOCP(vcp), SMB_COM_SESSION_SETUP_ANDX, scred, &rqp);
if (error)
return error;
- pbuf = malloc(SMB_MAXPASSWORDLEN + 1, M_SMBTEMP, M_WAITOK);
- encpass = malloc(24, M_SMBTEMP, M_WAITOK);
+ pbuf = malloc(SMB_MAXPASSWORDLEN + 1, M_SMBTEMP, 0);
+ encpass = malloc(24, M_SMBTEMP, 0);
if (vcp->vc_sopt.sv_sm & SMB_SM_USER) {
/*
* We try w/o uppercasing first so Samba mixed case
@@ -302,7 +302,7 @@ again:
if (vcp->vc_sopt.sv_sm & SMB_SM_ENCRYPT) {
uniplen = plen = 24;
smb_encrypt(pbuf, vcp->vc_ch, encpass);
- ntencpass = malloc(uniplen, M_SMBTEMP, M_WAITOK);
+ ntencpass = malloc(uniplen, M_SMBTEMP, 0);
if (SMB_UNICODE_STRINGS(vcp)) {
strncpy(pbuf, smb_vc_getpass(vcp),
SMB_MAXPASSWORDLEN);
@@ -318,7 +318,7 @@ again:
plen = strlen(pbuf) + 1;
pp = pbuf;
uniplen = plen * 2;
- ntencpass = malloc(uniplen, M_SMBTEMP, M_WAITOK);
+ ntencpass = malloc(uniplen, M_SMBTEMP, 0);
smb_strtouni(ntencpass, smb_vc_getpass(vcp));
plen--;
@@ -500,8 +500,8 @@ again:
pbuf = NULL;
encpass = NULL;
} else {
- pbuf = malloc(SMB_MAXPASSWORDLEN + 1, M_SMBTEMP, M_WAITOK);
- encpass = malloc(24, M_SMBTEMP, M_WAITOK);
+ pbuf = malloc(SMB_MAXPASSWORDLEN + 1, M_SMBTEMP, 0);
+ encpass = malloc(24, M_SMBTEMP, 0);
/*
* We try w/o uppercasing first so Samba mixed case
* passwords work. If that fails we come back and try
OpenPOWER on IntegriCloud