The branch, master has been updated via dbcdf3e Fix the poll() backend to correctly respond to POLLHUP|POLLERR returns on a fd selected for TEVENT_FD_WRITE only. via 710444d In samba_version.m4 the test to get the version now returns several lines instead of the one we really wanted which causes some spurious output when configure tries to print the samba version when it starts running. This is only a cosmetic problem but still looks ugly. via f090179 Fix warning messages on Freebsd 4.6.2. Signed-off-by: Jeremy Allison <j...@samba.org> from 43ab5aa lib/tdb/python/tests/simple.py: don't assume TDB ordering.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit dbcdf3e39c359241b743a9455ae695e14a30caa9 Author: Jeremy Allison <j...@samba.org> Date: Fri Jun 3 12:31:11 2011 -0700 Fix the poll() backend to correctly respond to POLLHUP|POLLERR returns on a fd selected for TEVENT_FD_WRITE only. Don't trigger the write handler and remove the POLLOUT flag for this fd. Report errors on TEVENT_FD_READ requests only. Metze please check ! Jeremy. Autobuild-User: Jeremy Allison <j...@samba.org> Autobuild-Date: Fri Jun 3 22:53:52 CEST 2011 on sn-devel-104 commit 710444d1108252e9a9cc80e963d47b542cc6c2f5 Author: Herb Lewis <hle...@panasas.com> Date: Thu Jun 2 10:15:18 2011 -0700 In samba_version.m4 the test to get the version now returns several lines instead of the one we really wanted which causes some spurious output when configure tries to print the samba version when it starts running. This is only a cosmetic problem but still looks ugly. Signed-off-by: Jeremy Allison <j...@samba.org> commit f0901792324425804592ac7032e3853b4d4c7829 Author: Herb Lewis <hle...@panasas.com> Date: Thu Jun 2 10:10:39 2011 -0700 Fix warning messages on Freebsd 4.6.2. Signed-off-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/tevent/tevent_poll.c | 14 +++++++++++++- lib/util/debug_s3.h | 2 ++ source3/m4/samba_version.m4 | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tevent/tevent_poll.c b/lib/tevent/tevent_poll.c index 712255b..0b782e9 100644 --- a/lib/tevent/tevent_poll.c +++ b/lib/tevent/tevent_poll.c @@ -233,7 +233,19 @@ static int poll_event_loop_poll(struct tevent_context *ev, pfd = &poll_ev->fds[pfd_idx]; - if (pfd->revents & (POLLIN|POLLHUP|POLLERR)) { + if (pfd->revents & (POLLHUP|POLLERR)) { + /* If we only wait for TEVENT_FD_WRITE, we + should not tell the event handler about it, + and remove the writable flag, as we only + report errors when waiting for read events + to match the select behavior. */ + if (!(fde->flags & TEVENT_FD_READ)) { + TEVENT_FD_NOT_WRITEABLE(fde); + continue; + } + flags |= TEVENT_FD_READ; + } + if (pfd->revents & POLLIN) { flags |= TEVENT_FD_READ; } if (pfd->revents & POLLOUT) { diff --git a/lib/util/debug_s3.h b/lib/util/debug_s3.h index 96b8ed7..9e5211b 100644 --- a/lib/util/debug_s3.h +++ b/lib/util/debug_s3.h @@ -17,6 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "librpc/gen_ndr/server_id.h" + struct messaging_context; struct server_id; void debug_message(struct messaging_context *msg_ctx, void *private_data, uint32_t msg_type, struct server_id src, DATA_BLOB *data); diff --git a/source3/m4/samba_version.m4 b/source3/m4/samba_version.m4 index dbea1f3..8ee0232 100644 --- a/source3/m4/samba_version.m4 +++ b/source3/m4/samba_version.m4 @@ -8,7 +8,7 @@ dnl http://www.gnu.org/licenses/ dnl dnl -SMB_VERSION_STRING=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2` +SMB_VERSION_STRING=`cat $srcdir/include/version.h | grep '#define SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2` echo "SAMBA VERSION: ${SMB_VERSION_STRING}" SAMBA_VERSION_GIT_COMMIT_FULLREV=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_FULLREV' | cut -d ' ' -f3- | cut -d '"' -f2` -- Samba Shared Repository