summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-12 12:48:30 +0200
committerVolker Lendecke <vl@samba.org>2010-08-12 13:31:51 +0200
commitc7a2e52ef171512e2c0f80a57dd3f61b4cf0dba1 (patch)
treee842a9342e1ec02edd8a3d87bc5a788967d645db
parent277248a4a7241a277cf442f0683b925d01a37ae6 (diff)
downloadsamba-c7a2e52ef171512e2c0f80a57dd3f61b4cf0dba1.tar.gz
samba-c7a2e52ef171512e2c0f80a57dd3f61b4cf0dba1.tar.bz2
samba-c7a2e52ef171512e2c0f80a57dd3f61b4cf0dba1.zip
s3: Slightly simplify the logic in smbd_server_connection_handler
-rw-r--r--source3/smbd/process.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 2e319135c7..40319a59af 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2331,8 +2331,11 @@ static void smbd_server_connection_handler(struct event_context *ev,
if (flags & EVENT_FD_WRITE) {
smbd_server_connection_write_handler(conn);
- } else if (flags & EVENT_FD_READ) {
+ return;
+ }
+ if (flags & EVENT_FD_READ) {
smbd_server_connection_read_handler(conn, smbd_server_fd());
+ return;
}
}