[SCM] Samba Shared Repository - branch v3-0-stable updated -
release-3-0-33-109-g9cf63bc
Karolin Seeger
kseeger at samba.org
Wed Jan 14 13:05:10 GMT 2009
The branch, v3-0-stable has been updated
via 9cf63bcbc1df74fc15d40ef3ffe8c7dd45118551 (commit)
via dd2ac7c4a4cfbc7310206e68949098c30f3c9a78 (commit)
via 18e45ae0c3f9e8167bc1431979110a654e0573b2 (commit)
via ae72dbdf5fc8ee5c4e4d9321f0bd8dc106f910bd (commit)
from 4843a9dff1d9692a0bf49eb8879d5f04a4b7556e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-stable
- Log -----------------------------------------------------------------
commit 9cf63bcbc1df74fc15d40ef3ffe8c7dd45118551
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Jan 14 14:02:08 2009 +0100
WHATSNEW: Update changes since 3.0.33.
Karolin
(cherry picked from commit 01debccb65fe63b070a2e219f7e4f2903f19fcfd)
commit dd2ac7c4a4cfbc7310206e68949098c30f3c9a78
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Jan 14 13:59:19 2009 +0100
WHATSNEW: Update WHATSNEW.
Karolin
(cherry picked from commit 5c3ec78c6dda9f354bee030967364411aafc0817)
commit 18e45ae0c3f9e8167bc1431979110a654e0573b2
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Jan 14 13:53:12 2009 +0100
VERSION: Raise version number up to 3.0.34.
Karolin
(cherry picked from commit d5e8b958c33491635a07be7b6ad84c0218d83aad)
commit ae72dbdf5fc8ee5c4e4d9321f0bd8dc106f910bd
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 13 11:24:24 2009 -0800
Fix bug #6019 File corruption in Clustered SMB/NFS environment managed via CTDB
Jeremy.
(cherry picked from commit 974262ba3e8226ec9805d38e602ec8d083e44f72)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 8 +++++++-
source/VERSION | 2 +-
source/lib/sendfile.c | 4 ++--
source/smbd/reply.c | 4 ++--
4 files changed, 12 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 22c40da..fc12cba 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -45,6 +45,8 @@ o Jeremy Allison <jra at samba.org>
* BUG 5873: Fix ACL inheritance.
* BUG 5914: Fix build failure (redefinition of struct name_list).
* BUG 5937: Fix filenames with "*" char hiding other files.
+ * BUG 6019: File corruption in Clustered SMB/NFS environment
+ managed via CTDB.
* Remove unecessary msync.
* Rename cifs.spnego to cifs.upcall.
* Fix segfault when execution cifs.upcall without any arguments.
@@ -52,7 +54,7 @@ o Jeremy Allison <jra at samba.org>
* Fix use of DLIST_REMOVE.
* Cope with bad trans2mkdir requests from System in QNTC IBM SMB client.
* Fix memory leak in error path.
- * Fix logic bug introduce in backport of ccache_regain_all_now.
+ * Fix logic bug introduced in backport of ccache_regain_all_now.
o Kai Blin <kai at samba.org>
@@ -120,6 +122,7 @@ o Stefan Metzmacher <metze at samba.org>
site.
* Add saf_join_store() function to memorize the dc used at join time.
* Return an error instead of crashing when no realm is given.
+ * Handle the SMB signing states the same in the krb5 and ntlmssp cases.
o Andreas Schneider <mail at cynapses.org>
@@ -144,6 +147,9 @@ o Andrew Tridgell <tridge at samba.org>
o Bo Yang <boyang at novell.com>
* Don't set child->requests to NULL in parent after fork.
+ * Backport of the clean event context after fork and krb5
+ refresh chain fixes.
+ * Fix null pointer refrence in event context in backport from v3-3-test.
o Qiao Yang <geoyang at ironport.com>
diff --git a/source/VERSION b/source/VERSION
index 204c530..419c703 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=3
SAMBA_VERSION_MINOR=0
-SAMBA_VERSION_RELEASE=33
+SAMBA_VERSION_RELEASE=34
########################################################
# Bug fix releases use a letter for the patch revision #
diff --git a/source/lib/sendfile.c b/source/lib/sendfile.c
index f4f6e16..4aa58c3 100644
--- a/source/lib/sendfile.c
+++ b/source/lib/sendfile.c
@@ -66,7 +66,7 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of
#endif
} while (nwritten == -1 && errno == EINTR);
if (nwritten == -1) {
- if (errno == ENOSYS) {
+ if (errno == ENOSYS || errno == EINVAL) {
/* Ok - we're in a world of pain here. We just sent
* the header, but the sendfile failed. We have to
* emulate the sendfile at an upper layer before we
@@ -144,7 +144,7 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of
nwritten = sendfile(tofd, fromfd, &small_offset, small_total);
} while (nwritten == -1 && errno == EINTR);
if (nwritten == -1) {
- if (errno == ENOSYS) {
+ if (errno == ENOSYS || errno == EINVAL) {
/* Ok - we're in a world of pain here. We just sent
* the header, but the sendfile failed. We have to
* emulate the sendfile at an upper layer before we
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index d8cbfd8..69a9885 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -2213,9 +2213,9 @@ void send_file_readbraw(connection_struct *conn, files_struct *fsp, SMB_OFF_T st
header.free = NULL;
if ( SMB_VFS_SENDFILE( smbd_server_fd(), fsp, fsp->fh->fd, &header, startpos, nread) == -1) {
- /* Returning ENOSYS or EINVAL means no data at all was sent.
+ /* Returning ENOSYS means no data at all was sent.
Do this as a normal read. */
- if (errno == ENOSYS || errno == EINVAL) {
+ if (errno == ENOSYS) {
goto normal_readbraw;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list