[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  1c9b856 tevent: Only call handlers that ask for events
       via  0cec0f0 Fix crash in SMB2 rename found by gentest. We must always have an lcomp in the destination struct for a rename, so set the flag appropriately.
      from  5c52644 maintainers: delete the old MAINTAINERS file

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1c9b85667070ee3292862d007f03b33b10713edd
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Oct 6 18:47:08 2010 +0200

    tevent: Only call handlers that ask for events
    
    The s3 libsmbclient puts two different handlers on a single fd for readability
    and writability. With select this works fine, however without this patch we
    unconditionally call the write handler even if the socket is only readable. We
    should have called the read handler instead.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Wed Oct  6 23:40:24 UTC 2010 on sn-devel-104

commit 0cec0f0912bc0cc15715fd68483f28e5b68e4439
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 5 16:47:23 2010 -0700

    Fix crash in SMB2 rename found by gentest. We must always have an lcomp
    in the destination struct for a rename, so set the flag appropriately.
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 lib/tevent/tevent_standard.c |    2 +-
 source3/smbd/trans2.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tevent/tevent_standard.c b/lib/tevent/tevent_standard.c
index 1c8ed0e..a68a03c 100644
--- a/lib/tevent/tevent_standard.c
+++ b/lib/tevent/tevent_standard.c
@@ -505,7 +505,7 @@ static int std_event_loop_select(struct std_event_context *std_ev, struct timeva
 
 			if (FD_ISSET(fde->fd, &r_fds)) flags |= TEVENT_FD_READ;
 			if (FD_ISSET(fde->fd, &w_fds)) flags |= TEVENT_FD_WRITE;
-			if (flags) {
+			if (flags & fde->flags) {
 				fde->handler(std_ev->ev, fde, flags, fde->private_data);
 				break;
 			}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 701f262..ac6f8cd 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -6080,7 +6080,7 @@ static NTSTATUS smb_file_link_information(connection_struct *conn,
 				conn,
 				req->flags2 & FLAGS2_DFS_PATHNAMES,
 				newname,
-				0,
+				UCF_SAVE_LCOMP,
 				NULL,
 				&smb_fname_dst);
 	if (!NT_STATUS_IS_OK(status)) {


-- 
Samba Shared Repository