[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 5f68f72 vfs_snapper: check for linux/ioctl.h
via d840f11 s3:messaging: fix conversion specifier
from dbb191f libcli/smb: Add smb2_lease_equal() which compares
client_guids and keys.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5f68f7289c3028f50a449120cce000dcf40db788
Author: Ralph Boehme r...@sernet.de
Date: Sat Nov 8 22:18:08 2014 +0100
vfs_snapper: check for linux/ioctl.h
Signed-off-by: Ralph Boehme s...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
Autobuild-User(master): Volker Lendecke v...@samba.org
Autobuild-Date(master): Sun Nov 9 16:02:24 CET 2014 on sn-devel-104
commit d840f11386d9b45918ff19064f71090569d1a26d
Author: Ralph Boehme r...@sernet.de
Date: Sun Oct 5 17:44:08 2014 +0200
s3:messaging: fix conversion specifier
Signed-off-by: Ralph Boehme s...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
---
Summary of changes:
source3/lib/messages_ctdbd.c | 5 +++--
source3/modules/vfs_snapper.c | 2 ++
source3/wscript | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 3d600bf..eb7e929 100644
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -80,8 +80,9 @@ struct ctdbd_connection *messaging_ctdbd_connection(void)
if (global_ctdb_connection_pid != getpid()) {
DEBUG(0,(messaging_ctdbd_connection():
-valid for pid[%d] but it's [%d]\n,
-global_ctdb_connection_pid, getpid()));
+valid for pid[%jd] but it's [%jd]\n,
+(intmax_t)global_ctdb_connection_pid,
+(intmax_t)getpid()));
smb_panic(messaging_ctdbd_connection() invalid process\n);
}
diff --git a/source3/modules/vfs_snapper.c b/source3/modules/vfs_snapper.c
index f0f0b5c..12a3b9a 100644
--- a/source3/modules/vfs_snapper.c
+++ b/source3/modules/vfs_snapper.c
@@ -25,7 +25,9 @@
*/
#include dbus/dbus.h
+#ifdef HAVE_LINUX_IOCTL_H
#include linux/ioctl.h
+#endif
#include sys/ioctl.h
#include dirent.h
#include libgen.h
diff --git a/source3/wscript b/source3/wscript
index ba1125e..f61c049 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -77,7 +77,7 @@ def configure(conf):
conf.ADD_LDFLAGS(-Wl,--export-dynamic, testflags=True)
conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')
-conf.CHECK_HEADERS('linux/falloc.h')
+conf.CHECK_HEADERS('linux/falloc.h linux/ioctl.h')
conf.CHECK_FUNCS('getcwd fchown chmod fchmod mknod')
conf.CHECK_FUNCS('strtol strchr strupr chflags')
--
Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2014-11-09-1655/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-11-09-1655/samba.stderr http://git.samba.org/autobuild.flakey/2014-11-09-1655/samba.stdout The top commit at the time of the failure was: commit dbb191f35bb093ad7fc8839b3d47e508be8f6069 Author: Jeremy Allison j...@samba.org Date: Tue Nov 4 21:44:45 2014 -0800 libcli/smb: Add smb2_lease_equal() which compares client_guids and keys. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org Autobuild-User(master): Jeremy Allison j...@samba.org Autobuild-Date(master): Fri Nov 7 22:41:47 CET 2014 on sn-devel-104
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via 7e486b9 s3:smbd: fix file corruption using write cache size != 0 from 1b0da1d spoolss: fix handling of bad EnumJobs levels https://git.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 7e486b942c7e5cd923bb9ced6b7bc9649bc7100e Author: Stefan Metzmacher me...@samba.org Date: Fri Nov 7 15:57:40 2014 -0800 s3:smbd: fix file corruption using write cache size != 0 A client can: - open a handle (h1) - write some data to h1. - open a 2nd handle h2 (downgrades both handles to level II) - try to read the data on h2 (this gets old data) Bug: https://bugzilla.samba.org/show_bug.cgi?id=10921 Signed-off-by: Stefan Metzmacher me...@samba.org Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org Autobuild-Date(v4-0-test): Sun Nov 9 22:51:19 CET 2014 on sn-devel-104 --- Summary of changes: source3/smbd/oplock.c | 3 +++ 1 file changed, 3 insertions(+) Changeset truncated at 500 lines: diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 95d88ef..045fd469 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -151,6 +151,9 @@ static void downgrade_file_oplock(files_struct *fsp) sconn-oplocks.level_II_open++; fsp-sent_oplock_break = NO_BREAK_SENT; + flush_write_cache(fsp, OPLOCK_RELEASE_FLUSH); + delete_write_cache(fsp); + TALLOC_FREE(fsp-oplock_timeout); } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-1-test updated
The branch, v4-1-test has been updated via 00f6184 s3:smbd: fix file corruption using write cache size != 0 via 907e64c s3: nmbd: Ensure NetBIOS names are only 15 characters stored. via 56ed600 s3: libsmbclient - smb2. MacOSX 10 SMB2 server doesn't set STATUS_NO_MORE_FILES when handed a non-wildcard path. via 5126c01 spoolss: fix handling of bad EnumJobs levels via 39a9211 s3-nmbd: Fix netbios name truncation. via 0e03a17 There are tests all over the SMB1 code to check that srv_send_smb fails, but it never returns false. via 859a84d s3: daemons - ensure nmbd and winbindd are consistent in command line processing by adding POPT_COMMON_DYNCONFIG. from 43fbaf6 vfs_glusterfs: Remove integer fd code and store the glfs pointers. https://git.samba.org/?p=samba.git;a=shortlog;h=v4-1-test - Log - commit 00f6184e52b7b4a044b8696e02023cd548ce87aa Author: Stefan Metzmacher me...@samba.org Date: Fri Nov 7 15:57:40 2014 -0800 s3:smbd: fix file corruption using write cache size != 0 A client can: - open a handle (h1) - write some data to h1. - open a 2nd handle h2 (downgrades both handles to level II) - try to read the data on h2 (this gets old data) Bug: https://bugzilla.samba.org/show_bug.cgi?id=10921 Signed-off-by: Stefan Metzmacher me...@samba.org Autobuild-User(v4-1-test): Karolin Seeger ksee...@samba.org Autobuild-Date(v4-1-test): Sun Nov 9 22:57:54 CET 2014 on sn-devel-104 commit 907e64cc6534933d5da780444e930488ecd8aa42 Author: Jeremy Allison j...@samba.org Date: Fri Oct 31 11:01:26 2014 -0700 s3: nmbd: Ensure NetBIOS names are only 15 characters stored. This screws up if the name is greater than MAX_NETBIOSNAME_LEN-1 in the unix charset, but less than or equal to MAX_NETBIOSNAME_LEN-1 in the DOS charset, but this is so old we have to live with that. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10920 Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Andreas Schneider a...@samba.org (cherry picked from commit 7467f6e72cba214eeca75c34e9d9fba354c7ef31) Signed-off-by: Andreas Schneider a...@samba.org commit 56ed6003219655443578bb08f24dd5c8587cc85a Author: Jeremy Allison j...@samba.org Date: Tue Oct 21 14:41:32 2014 -0700 s3: libsmbclient - smb2. MacOSX 10 SMB2 server doesn't set STATUS_NO_MORE_FILES when handed a non-wildcard path. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Steve French smfre...@gmail.com Tested-by: Ralph Boehme s...@samba.org Autobuild-User(master): Steve French sfre...@samba.org Autobuild-Date(master): Thu Oct 23 20:44:31 CEST 2014 on sn-devel-104 (cherry picked from commit 95bf43bc6a0b6a4a47b8a556eee3b78446ea4123) Bug: https://bugzilla.samba.org/show_bug.cgi?id=10904 smbclient loops doing a directory listing against Mac OS X 10 server with a non-wildcard path. commit 5126c0157757d16c723d3a23f3b0218c06994f86 Author: David Disseldorp dd...@samba.org Date: Mon Oct 27 20:13:59 2014 +0100 spoolss: fix handling of bad EnumJobs levels Currently Samba is inconsistent when returning WERR_UNKNOWN_LEVEL errors for spoolss EnumJobs requests - if no print jobs are present, then WERR_OK will be returned, regardless of whether the EnumJobs level is supported or not. This change fixes this behaviour, by catching invalid or unsupported levels prior to the no-jobs response fast-path. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10898 Signed-off-by: David Disseldorp dd...@samba.org Reviewed-by: Jeremy Allison j...@samba.org Autobuild-User(master): Jeremy Allison j...@samba.org Autobuild-Date(master): Tue Oct 28 03:05:35 CET 2014 on sn-devel-104 (cherry picked from commit d4f233a746d89e13aae78008b499c71b695ff882) commit 39a9211e2c59f98b3185419c6409298c0abb77f5 Author: Jeremy Allison j...@samba.org Date: Tue Oct 28 11:55:30 2014 -0700 s3-nmbd: Fix netbios name truncation. Try and cope with truncation more intelligently. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10896 Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Andreas Schneider a...@samba.org (cherry picked from commit 6adcc7bffd5e1474ecba04d2328955c0b208cabc) Signed-off-by: Andreas Schneider a...@samba.org commit 0e03a17bc70232cd07fbd1e0e8a99b3b3e10feb5 Author: Richard Sharpe realrichardsha...@gmail.com Date: Mon Jul 22 16:04:43 2013 -0700 There are tests all over the SMB1 code to check that srv_send_smb fails, but it never returns false. Even if the write to the socket/fd fails, we never return false and will keep reading stuff off of the input buffer until it is exhausted and then we will exit. Signed-off-by: Richard Sharpe
[SCM] Samba Shared Repository - branch v4-2-test updated
The branch, v4-2-test has been updated
via 5907060 s3:smbstatus: fix return value in print_share_mode()
from f2cb16e s3:smbd: fix file corruption using write cache size != 0
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test
- Log -
commit 5907060010a7155697ed51de69ee174f7e386e5a
Author: Stefan Metzmacher me...@samba.org
Date: Wed Nov 5 20:27:06 2014 +0100
s3:smbstatus: fix return value in print_share_mode()
Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
(cherry picked from commit 5cb4a285690958c8349cb87d5d46d955df789ca4)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10911
SMB2 leases are not yet supported.
Autobuild-User(v4-2-test): Karolin Seeger ksee...@samba.org
Autobuild-Date(v4-2-test): Sun Nov 9 23:30:30 CET 2014 on sn-devel-104
---
Summary of changes:
source3/utils/status.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/status.c b/source3/utils/status.c
index b589813..9cb4d8b 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -123,7 +123,7 @@ static int print_share_mode(const struct share_mode_entry
*e,
static int count;
if (do_checks !is_valid_share_mode_entry(e)) {
- return;
+ return 0;
}
if (count==0) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2afc5b7 Don't use a nested function when testing for visibility
attribute support.
via e2b5ae1 data_blob.h: Add space between literal and string constant.
via 6bc62af Use tevent_req_simple_recv_unix in a few places
via f5c17d4 lib: Add tevent_req_simple_recv_unix
from 5f68f72 vfs_snapper: check for linux/ioctl.h
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2afc5b797826780c07e04ed153edc82f410668a2
Author: Jelmer Vernooij jel...@samba.org
Date: Sat Nov 8 16:22:30 2014 +
Don't use a nested function when testing for visibility attribute support.
Some compilers support __attribute__((visibility)), but not nested
functions (e.g. http://www.cprover.org/goto-cc/)
Change-Id: I01a5dd6f5f913664621c4090e2dca177527436bb
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749983
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749985
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749986
Signed-Off-By: Jelmer Vernooij jel...@debian.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Mon Nov 10 08:29:19 CET 2014 on sn-devel-104
commit e2b5ae135b740c7a6d04c2ef8137ce4064d83dff
Author: Jelmer Vernooij jel...@samba.org
Date: Sat Nov 8 14:15:41 2014 +
data_blob.h: Add space between literal and string constant.
C++11 compilers warn if there is a missing space:
invalid suffix on literal; C++11 requires a space between literal and
string macro [-Wliteral-suffix]
Change-Id: Ib7e11c72c09de588ec558cfbf9dded8c625bf49b
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit 6bc62af42ea5cc2eba90c73fb73188b57a59a347
Author: Volker Lendecke v...@samba.org
Date: Sat Nov 8 09:05:23 2014 +
Use tevent_req_simple_recv_unix in a few places
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit f5c17d41e085e083ef970692ff7f50f7a6642ea3
Author: Volker Lendecke v...@samba.org
Date: Sat Nov 8 09:00:31 2014 +
lib: Add tevent_req_simple_recv_unix
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
---
Summary of changes:
lib/replace/wscript| 4 ++--
lib/util/data_blob.h | 6 +++---
lib/util/tevent_unix.c | 13 +
lib/util/tevent_unix.h | 1 +
source3/lib/ctdb_conn.c| 6 +-
source3/lib/tevent_barrier.c | 7 +--
source3/lib/tevent_wait.c | 7 +--
source3/smbd/notify_internal.c | 7 +--
8 files changed, 23 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 16fd50b..7bbe1d6 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -639,10 +639,10 @@ removeea setea
if conf.CHECK_CFLAGS('-fvisibility=hidden'):
conf.env.VISIBILITY_CFLAGS = '-fvisibility=hidden'
-conf.CHECK_CODE('''void vis_foo1(void) {}
+conf.CHECK_CODE('''int main(void) { return 0; }
__attribute__((visibility(default))) void
vis_foo2(void) {}''',
cflags=conf.env.VISIBILITY_CFLAGS,
-define='HAVE_VISIBILITY_ATTR')
+define='HAVE_VISIBILITY_ATTR', addmain=False)
# look for a method of finding the list of network interfaces
for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX',
'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']:
diff --git a/lib/util/data_blob.h b/lib/util/data_blob.h
index a5caa92..94af767 100644
--- a/lib/util/data_blob.h
+++ b/lib/util/data_blob.h
@@ -49,9 +49,9 @@ struct data_blob_list_item {
a fair bit of code */
#define ldb_val datablob
-#define data_blob(ptr, size) data_blob_named(ptr, size, DATA_BLOB:
__location__)
-#define data_blob_talloc(ctx, ptr, size) data_blob_talloc_named(ctx, ptr,
size, DATA_BLOB: __location__)
-#define data_blob_dup_talloc(ctx, blob) data_blob_talloc_named(ctx,
(blob).data, (blob).length, DATA_BLOB: __location__)
+#define data_blob(ptr, size) data_blob_named(ptr, size, DATA_BLOB:
__location__)
+#define data_blob_talloc(ctx, ptr, size) data_blob_talloc_named(ctx, ptr,
size, DATA_BLOB: __location__)
+#define data_blob_dup_talloc(ctx, blob) data_blob_talloc_named(ctx,
(blob).data, (blob).length, DATA_BLOB: __location__)
/**
construct a data blob, must be freed with data_blob_free()
diff --git a/lib/util/tevent_unix.c b/lib/util/tevent_unix.c
index e4c960e..ee7ec8a 100644
--- a/lib/util/tevent_unix.c
+++ b/lib/util/tevent_unix.c
@@ -48,3 +48,16 @@ bool tevent_req_is_unix_error(struct tevent_req
