summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-12 12:48:43 +0200
committerVolker Lendecke <vl@samba.org>2010-08-12 13:31:51 +0200
commitc672797a0a2fe3aa3bd2d2ef449cb5866d289981 (patch)
tree90df8cb42de1e0f7fbb36fdd43dc26cbf37fd48e /source3
parentc7a2e52ef171512e2c0f80a57dd3f61b4cf0dba1 (diff)
downloadsamba-c672797a0a2fe3aa3bd2d2ef449cb5866d289981.tar.gz
samba-c672797a0a2fe3aa3bd2d2ef449cb5866d289981.tar.bz2
samba-c672797a0a2fe3aa3bd2d2ef449cb5866d289981.zip
s3: Slightly simplify the logic in smbd_server_echo_handler
Diffstat (limited to 'source3')
-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 40319a59af..ea9fb1c5c0 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2349,9 +2349,12 @@ static void smbd_server_echo_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, conn->smb1.echo_handler.trusted_fd);
+ return;
}
}