sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r7782: fixed an ordering problem with smb requests. I found this when I had "sam database"

Browse Source 
set to the internal ldap server over loopback. The following happened:

  - DCERPC_AUTH3 request
     - auth requests calls ldb
     - ldb calls ldap
     - ldap calls our internal ldap server, triggering events
  - samrConnect from client
     - connect refused
  - SMBclose from client
     - causes dcerpc_pipe to be destroyed
  - AUTH3 continues
     - dies on freed pipe

I chose this solution as it provides a guarantee that backends only have to think about
async issues when they mark a request async. When they don't, this code guarantees that
a second request won't happen on the same connection while processing the first one
This commit is contained in:
Andrew Tridgell 2005-06-20 08:47:52 +00:00 committed by Gerald (Jerry) Carter
parent 5760ed20ee
commit 45487e8a14
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/smb_server/smb_server.c
View File

@ -665,7 +665,18 @@ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags)
DEBUG(10,("smbsrv_recv\n"));
/* our backends are designed to process one request at a time,
unless they deliberately mark the request as async and
process it later on a timer or other event. This enforces
that ordering. */
if (smb_conn->processing) {
EVENT_FD_NOT_READABLE(conn->event.fde);
return;
}
smb_conn->processing = True;
status = receive_smb_request(smb_conn);
smb_conn->processing = False;
if (NT_STATUS_IS_ERR(status)) {
talloc_free(conn->event.fde);
conn->event.fde = NULL;
@ -673,6 +684,8 @@ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags)
return;
}
EVENT_FD_READABLE(conn->event.fde);
/* free up temporary memory */
lp_talloc_free();
}
@ -749,6 +762,7 @@ static void smbsrv_accept(struct stream_connection *conn)
smbsrv_tcon_init(smb_conn);
smb_conn->connection = conn;
smb_conn->processing = False;
conn->private = smb_conn;
}

2
source/smb_server/smb_server.h
View File

@ -254,4 +254,6 @@ struct smbsrv_connection {
struct smb_trans2 *trans;
uint8_t command;
} *trans_partial;
BOOL processing;
};