[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28-87-g3e175d7

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  3e175d791785b3b6dc1dbbed6db07cbfe3cdb89b (commit)
       via  6ce07b63f119aceb8af3740c024fde1df9121a4c (commit)
       via  b65a166132e6834f8111c3e41579f5e1e68e0ec6 (commit)
      from  514991a4acc55c721e6ad8b5a27106ab35ea5d45 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -----------------------------------------------------------------
commit 3e175d791785b3b6dc1dbbed6db07cbfe3cdb89b
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 8 18:43:48 2008 -0800

    Fix resource leak on error found by coverity.
    Jeremy.

commit 6ce07b63f119aceb8af3740c024fde1df9121a4c
Merge: b65a166132e6834f8111c3e41579f5e1e68e0ec6 514991a4acc55c721e6ad8b5a27106ab35ea5d45
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 8 17:59:46 2008 -0800

    Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test

commit b65a166132e6834f8111c3e41579f5e1e68e0ec6
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jan 4 23:18:42 2008 -0800

    Using a bool with a logical operation. IBM checker caught.
    Jeremy.

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

Summary of changes:
 source/smbd/open.c  |    2 +-
 source/smbd/reply.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/open.c b/source/smbd/open.c
index 351b72e..6955140 100644
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -1375,7 +1375,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 	}
 #endif /* O_SYNC */
   
-	if (posix_open & (access_mask & FILE_APPEND_DATA)) {
+	if (posix_open && (access_mask & FILE_APPEND_DATA)) {
 		flags2 |= O_APPEND;
 	}
 
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 54bf888..b954395 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -5169,11 +5169,13 @@ int reply_copy(connection_struct *conn, char *inbuf,char *outbuf, int dum_size,
 
 			status = check_name(conn, fname);
 			if (!NT_STATUS_IS_OK(status)) {
+				CloseDir(dir_hnd);
 				return ERROR_NT(status);
 			}
 		
 			status = check_name(conn, destname);
 			if (!NT_STATUS_IS_OK(status)) {
+				CloseDir(dir_hnd);
 				return ERROR_NT(status);
 			}
 		


-- 
Samba Shared Repository