sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

r18773: Change negprot_spnego to return a blob

Browse Source 
(This used to be commit 28fa772721640a6d3a0f6a30fb56fde18b5f5616)
This commit is contained in:
Volker Lendecke 2006-09-21 05:29:07 +00:00 committed by Gerald (Jerry) Carter
parent 3bddf16b1f
commit c209219d06
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/smbd/negprot.c
View File

@ -169,7 +169,7 @@ static int reply_lanman2(char *inbuf, char *outbuf)
Generate the spnego negprot reply blob. Return the number of bytes used. Generate the spnego negprot reply blob. Return the number of bytes used.
****************************************************************************/ ****************************************************************************/
static int negprot_spnego(char *p) static DATA_BLOB negprot_spnego(void)
{ {
DATA_BLOB blob; DATA_BLOB blob;
nstring dos_name; nstring dos_name;
@ -180,7 +180,6 @@ static int negprot_spnego(char *p)
OID_NTLMSSP, OID_NTLMSSP,
NULL}; NULL};
const char *OIDs_plain[] = {OID_NTLMSSP, NULL}; const char *OIDs_plain[] = {OID_NTLMSSP, NULL};
int len;
global_spnego_negotiated = True; global_spnego_negotiated = True;
@ -222,11 +221,7 @@ static int negprot_spnego(char *p)
SAFE_FREE(host_princ_s); SAFE_FREE(host_princ_s);
} }
memcpy(p, blob.data, blob.length); return blob;
len = blob.length;
data_blob_free(&blob);
return len;
} }
/**************************************************************************** /****************************************************************************
@ -332,10 +327,17 @@ static int reply_nt1(char *inbuf, char *outbuf)
STR_UNICODE|STR_TERMINATE|STR_NOALIGN); STR_UNICODE|STR_TERMINATE|STR_NOALIGN);
DEBUG(3,("not using SPNEGO\n")); DEBUG(3,("not using SPNEGO\n"));
} else { } else {
int len = negprot_spnego(p); DATA_BLOB spnego_blob = negprot_spnego();
if (spnego_blob.data == NULL) {
return ERROR_NT(NT_STATUS_NO_MEMORY);
}
memcpy(p, spnego_blob.data, spnego_blob.length);
p += spnego_blob.length;
data_blob_free(&spnego_blob);
SCVAL(outbuf,smb_vwv16+1, 0); SCVAL(outbuf,smb_vwv16+1, 0);
p += len;
DEBUG(3,("using SPNEGO\n")); DEBUG(3,("using SPNEGO\n"));
} }