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

Patch from Stefan Metzmacher <metze@metzemix.de> to fix signing problems

Browse Source 
when reverse connecting back to a client for printer notify.
Jeremy.
(This used to be commit 7fde193efeb856ec325d5d563f1e710c45dc65d7)
This commit is contained in:
Jeremy Allison 2003-10-21 21:18:58 +00:00
parent af4263e46e
commit db8e98175c
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/lib/util_sock.c
View File

@ -497,9 +497,10 @@ ssize_t read_smb_length(int fd,char *inbuf,unsigned int timeout)
BUFFER_SIZE+SAFETY_MARGIN.
The timeout is in milliseconds.
This function will return on receipt of a session keepalive packet.
Doesn't check the MAC on signed packets.
****************************************************************************/
BOOL receive_smb(int fd,char *buffer, unsigned int timeout)
BOOL receive_smb_raw(int fd,char *buffer, unsigned int timeout)
{
ssize_t len,ret;
@ -509,7 +510,7 @@ BOOL receive_smb(int fd,char *buffer, unsigned int timeout)
len = read_smb_length_return_keepalive(fd,buffer,timeout);
if (len < 0) {
DEBUG(10,("receive_smb: length < 0!\n"));
DEBUG(10,("receive_smb_raw: length < 0!\n"));
/*
* Correct fix. smb_read_error may have already been
@ -552,6 +553,20 @@ BOOL receive_smb(int fd,char *buffer, unsigned int timeout)
}
}
return True;
}
/****************************************************************************
Wrapper for receive_smb_raw().
Checks the MAC on signed packets.
****************************************************************************/
BOOL receive_smb(int fd,char *buffer, unsigned int timeout)
{
if (!receive_smb_raw(fd, buffer, timeout)) {
return False;
}
/* Check the incoming SMB signature. */
if (!srv_check_sign_mac(buffer)) {
DEBUG(0, ("receive_smb: SMB Signature verification failed on incoming packet!\n"));

2
source3/libsmb/clientgen.c
View File

@ -59,7 +59,7 @@ static BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout)
BOOL ret;
for(;;) {
ret = receive_smb(fd, buffer, timeout);
ret = receive_smb_raw(fd, buffer, timeout);
if (!ret) {
DEBUG(10,("client_receive_smb failed\n"));

3
source3/rpc_server/srv_spoolss_nt.c
View File

@ -2598,7 +2598,8 @@ static BOOL spoolss_connect_to_client(struct cli_state *the_cli,
}
the_cli->protocol = PROTOCOL_NT1;
cli_setup_signing_state(the_cli, lp_client_signing());
if (!cli_negprot(the_cli)) {
DEBUG(0,("spoolss_connect_to_client: machine %s rejected the negotiate protocol. Error was : %s.\n", remote_machine, cli_errstr(the_cli) ));
cli_shutdown(the_cli);

2
source3/smbd/blocking.c
View File

@ -149,7 +149,7 @@ for fnum = %d, name = %s\n", length, (int)blr->expire_time, lock_timeout,
blr->fsp->fnum, blr->fsp->fsp_name ));
/* Push the MID of this packet on the signing queue. */
srv_defer_sign_response(SVAL(inbuf,smb_mid), True);
srv_defer_sign_response(SVAL(inbuf,smb_mid));
return True;
}