autobuild[sn-devel-144]: intermittent test failure detected

2018-01-05 Thread autobuild 
The autobuild test system (on sn-devel-144) 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.sn-devel-144/2018-01-06-0715/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2018-01-06-0715/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2018-01-06-0715/samba.stdout
  
The top commit at the time of the failure was:

commit debf8ba799ea7a4535e29c20a5f9377932c81938
Author: Ralph Boehme 
Date:   Thu Jan 4 17:22:16 2018 +0100

vfs_fileid: add fileid:algorithm = fsname_norootdir

Based-on-a-patch-by: Ralph Wuerthner 

Signed-off-by: Ralph Boehme 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Sat Jan  6 04:41:24 CET 2018 on sn-devel-144

[SCM] Samba Shared Repository - branch master updated

2018-01-05 Thread Jeremy Allison 
The branch, master has been updated
   via  debf8ba vfs_fileid: add fileid:algorithm = fsname_norootdir
   via  1468dd2 vfs_fileid: add fileid:nolockinode parameter
   via  b599cb2 vfs_fileid: add fileid:algorithm = fsname_nodirs
   via  495c646 vfs_fileid: add fileid:algorithm = hostname
   via  6a8764e vfs_fileid: convert dev argument of the device_mapping_fn 
to SMB_STRUCT_STAT
   via  9962495 vfs_fileid: add "fstype/mntdir deny/allow list" option
   via  326df16 vfs_fileid: preserve errno in an error code path
   via  5cce620 vfs_fileid: add a DEBUG message to log dev and inode
   via  d0def3b tests: The pthreadpooltests do not need a full environment
   via  74dbeba dnscli: Make a few functions static
   via  361ea74 samba: Only use async signal-safe functions in signal 
handler
   via  e1fb902 s4/torture: test vfs_fruit "fruit:time machine max size" 
option
   via  74eebac vfs_fruit: add "time machine max size" option
  from  3cbeaf4 docs-xml: add basic Makefile dependencies for targets that 
use xsltproc

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


- Log -
commit debf8ba799ea7a4535e29c20a5f9377932c81938
Author: Ralph Boehme 
Date:   Thu Jan 4 17:22:16 2018 +0100

vfs_fileid: add fileid:algorithm = fsname_norootdir

Based-on-a-patch-by: Ralph Wuerthner 

Signed-off-by: Ralph Boehme 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Sat Jan  6 04:41:24 CET 2018 on sn-devel-144

commit 1468dd21c37445cff044583229b107254d53b2b9
Author: Ralph Boehme 
Date:   Thu Jan 4 17:09:21 2018 +0100

vfs_fileid: add fileid:nolockinode parameter

Based-on-a-patch-by: Ralph Wuerthner 

Signed-off-by: Ralph Boehme 
Reviewed-by: Jeremy Allison 

commit b599cb216815415a63504ec69be3f70f08ea58d5
Author: Ralph Boehme 
Date:   Thu Jan 4 17:02:53 2018 +0100

vfs_fileid: add fileid:algorithm = fsname_nodirs

Enabling fileid:algorithm = fsname_nodirs uses the hostname algorithm
for directories and thus breaks cluster lock coherence for directories.

Based-on-a-patch-by: Christian Ambach 

Signed-off-by: Ralph Boehme 
Reviewed-by: Jeremy Allison 

commit 495c646ec5cbd61539f6c547cd6048d7ff167d30
Author: Ralph Boehme 
Date:   Thu Jan 4 16:59:54 2018 +0100

vfs_fileid: add fileid:algorithm = hostname

Using fileid:algorithm = hostname makes fileid generate
fileids based on the hostname. This breaks cluster lock coherence.

Based-on-a-patch-by: Christian Ambach 

Signed-off-by: Ralph Boehme 
Reviewed-by: Jeremy Allison 

commit 6a8764ebcc0de57e7dd0dc22eaf4a9d201c0dca9
Author: Ralph Boehme 
Date:   Thu Jan 4 16:35:38 2018 +0100

vfs_fileid: convert dev argument of the device_mapping_fn to SMB_STRUCT_STAT

This is in preperation of adding an additional mapping function that
acts differently depending of the file type. No change in behaviour.

Signed-off-by: Ralph Boehme 
Reviewed-by: Jeremy Allison 

commit 996249571d0e8f9285d1b714b1c36d66e7649271
Author: Ralph Wuerthner 
Date:   Tue Jan 12 16:00:24 2016 +0100

vfs_fileid: add "fstype/mntdir deny/allow list" option

When using the fsname or fsid algorithm a stat() and statfs() call is
required for all mounted file systems to generate the file_id. If e.g.
an NFS file system is unresponsive such a call might block and the smbd
process will become unresponsive. Add "fileid:fstype deny",
"fileid:fstype allow", "fileid:mntdir deny", and "fileid:mntdir allow"
options to ignore potentially unresponsive file systems.

See also 
https://lists.samba.org/archive/samba-technical/2016-January/111553.html
for a discussion about why this is useful.

Signed-off-by: Ralph Wuerthner 
Reviewed-by: Ralph Boehme 
Reviewed-by: Jeremy Allison 

commit 326df161736abc16fb3bd35a18a3e55a44fb3c5d
Author: Ralph Boehme 
Date:   Fri Jan 5 10:23:30 2018 +0100

vfs_fileid: preserve errno in an error code path

Signed-off-by: Ralph Boehme 
Reviewed-by: Jeremy Allison 

commit 5cce620bc1eac9a3f0bbf58084b7df2acde6bb15
Author: Ralph Boehme 
Date:   Thu Jan 4 17:25:07 2018 +0100

vfs_fileid: add a DEBUG message to log dev and inode

Signed-off-by: Ralph Boehme 
Reviewed-by: Jeremy Allison

autobuild[sn-devel-144]: intermittent test failure detected

2018-01-05 Thread autobuild 
The autobuild test system (on sn-devel-144) 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.sn-devel-144/2018-01-06-0135/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2018-01-06-0135/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2018-01-06-0135/samba.stdout
  
The top commit at the time of the failure was:

commit 3cbeaf40937082bd7072d715ae02aa0989835432
Author: Björn Jacke 
Date:   Thu Jan 4 16:35:12 2018 +0100

docs-xml: add basic Makefile dependencies for targets that use xsltproc

Signed-off-by: Bjoern Jacke 
Reviewed-by: Karolin Seeger 

Autobuild-User(master): Björn Jacke 
Autobuild-Date(master): Fri Jan  5 19:55:29 CET 2018 on sn-devel-144

[SCM] Samba Shared Repository - branch master updated

2018-01-05 Thread Björn Jacke 
The branch, master has been updated
   via  3cbeaf4 docs-xml: add basic Makefile dependencies for targets that 
use xsltproc
   via  9b27948 docs-xml: set a reasonable XML_CATALOG_FILES in Makefile
   via  a2f5b3b docs-xml: generate build/catalog.xml via Makefile target
  from  2245a4b autobuild: fix quoting of --restrict-tests

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


- Log -
commit 3cbeaf40937082bd7072d715ae02aa0989835432
Author: Björn Jacke 
Date:   Thu Jan 4 16:35:12 2018 +0100

docs-xml: add basic Makefile dependencies for targets that use xsltproc

Signed-off-by: Bjoern Jacke 
Reviewed-by: Karolin Seeger 

Autobuild-User(master): Björn Jacke 
Autobuild-Date(master): Fri Jan  5 19:55:29 CET 2018 on sn-devel-144

commit 9b27948d6540b17d99bed3e39e75b2508f05a489
Author: Björn Jacke 
Date:   Thu Jan 4 16:19:13 2018 +0100

docs-xml: set a reasonable XML_CATALOG_FILES in Makefile

Signed-off-by: Bjoern Jacke 
Reviewed-by: Karolin Seeger 

commit a2f5b3b8e12bfc3d7182a406526b0d7edaf58a31
Author: Björn Jacke 
Date:   Thu Jan 4 16:12:28 2018 +0100

docs-xml: generate build/catalog.xml via Makefile target

Signed-off-by: Bjoern Jacke 
Reviewed-by: Karolin Seeger 

---

Summary of changes:
 docs-xml/Makefile | 25 -
 1 file changed, 16 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index d69238b..ba49eae 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -6,6 +6,8 @@
 #  Jelmer Vernooij 
 include Makefile.settings
 
+export XML_CATALOG_FILES := $(XML_CATALOG_FILES) /etc/xml/catalog  $(shell 
pwd)/build/catalog.xml
+
 # Docs to build
 MAIN_DOCS = $(patsubst %/index.xml,%,$(wildcard */index.xml))
 MANPAGES = $(sort $(wildcard $(MANPAGEDIR)/*.?.xml))
@@ -16,6 +18,8 @@ DBLATEX_OPTIONS = -p xslt/latex.xsl -i xslt/latex
 
 DATETIME := $(shell date +%Y%m%d%H%M%S)
 
+XSLTPROC_DEPS = build/catalog.xml build/DTD/samba.build.version
+
 ifeq ($(PROFILE), Y)
 XSLTPROC += --profile --load-trace --timing
 endif
@@ -87,16 +91,16 @@ check:: validate
 
 # Intermediate docbook docs
 #
-$(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl
+$(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl $(XSLTPROC_DEPS)
@echo "Converting Samba-specific tags for $*..."
@mkdir -p $(@D)
@$(XSLTPROC) --stringparam latex.imagebasedir "$*/"  --stringparam 
noreference 0  --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
-$(DOCBOOKDIR)/manpages/%.xml: $(MANPAGEDIR)/%.xml xslt/expand-sambadoc.xsl 
Makefile.settings
+$(DOCBOOKDIR)/manpages/%.xml: $(MANPAGEDIR)/%.xml xslt/expand-sambadoc.xsl 
Makefile.settings $(XSLTPROC_DEPS)
@mkdir -p $(@D)
$(XSLTPROC) --xinclude --stringparam noreference 0 --output $@ 
xslt/expand-sambadoc.xsl $<
 
-$(DOCBOOKDIR)/manpages/index.xml: $(MANPAGES) xslt/manpage-summary.xsl
+$(DOCBOOKDIR)/manpages/index.xml: $(MANPAGES) xslt/manpage-summary.xsl 
$(XSLTPROC_DEPS)
@mkdir -p $(@D)
echo "" > $@
$(XSLTPROC) xslt/manpage-summary.xsl $(MANPAGES) >> $@
@@ -107,22 +111,22 @@ $(HTMLDIR)/index.html: htmldocs.html
@mkdir -p $(@D)
cp $< $@
 
-$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css 
xslt/html-chunk.xsl %-images-html-chunks
+$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css 
xslt/html-chunk.xsl %-images-html-chunks $(XSLTPROC_DEPS)
@mkdir -p $(@D)
$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/$*/" xslt/html-chunk.xsl 
$<
 
 # Single large HTML files
-$(OUTPUTDIR)/%/samba.css: xslt/html/samba.css
+$(OUTPUTDIR)/%/samba.css: xslt/html/samba.css $(XSLTPROC_DEPS)
@mkdir -p $(@D)
cp $< $@
 
 $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)): $(HTMLDIR)/%.html: 
%-images-html-single
 
-$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl 
+$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl 
$(XSLTPROC_DEPS)
$(XSLTPROC) --output $@ xslt/html.xsl $<
 
 # Attributions
-%-attributions.xml: 
+%-attributions.xml: $(XSLTPROC_DEPS)
@echo "Generating attributions file $@ from $*/"
@cp -f templates/attributions.xml $@
@$(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl 
$*/index.xml 
@@ -139,7 +143,7 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html
@$(DBLATEX) $(DBLATEX_OPTIONS) -t tex -o $@ $<
 
 # Dependency files
-%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl
+%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl $(XSLTPROC_DEPS)
@echo "Generating dependency

[SCM] Samba Shared Repository - branch v4-6-test updated

2018-01-05 Thread Karolin Seeger 
The branch, v4-6-test has been updated
   via  579b6a4 s3: smbd: Use identical logic to test for kernel oplocks on 
a share.
  from  6ba6125 smbd: Fix coredump on failing chdir during logoff

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test


- Log -
commit 579b6a4f603c97480a319353dcd7319dcbcb521e
Author: Jeremy Allison 
Date:   Wed Jan 3 09:52:33 2018 -0800

s3: smbd: Use identical logic to test for kernel oplocks on a share.

Due to inconsistent use of lp_kernel_oplocks() we could miss kernel
oplocks being on/off in some of our oplock handling code, and thus
use the wrong logic.

Ensure all logic around koplocks and lp_kernel_oplocks() is consistent.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13193

Signed-off-by: Jeremy Allison 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Thu Jan  4 16:03:38 CET 2018 on sn-devel-144

(cherry picked from commit 114f5da2fab6f587de77e792274b396fb3d7ce71)

Autobuild-User(v4-6-test): Karolin Seeger 
Autobuild-Date(v4-6-test): Fri Jan  5 13:40:55 CET 2018 on sn-devel-144

---

Summary of changes:
 source3/smbd/oplock.c | 25 ++---
 1 file changed, 18 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index d30de6a..dc11598 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -55,7 +55,8 @@ NTSTATUS set_file_oplock(files_struct *fsp)
 {
struct smbd_server_connection *sconn = fsp->conn->sconn;
struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
-   bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) && koplocks;
+   bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) &&
+   (koplocks != NULL);
 
if (fsp->oplock_type == LEVEL_II_OPLOCK) {
if (use_kernel &&
@@ -97,7 +98,8 @@ static void release_file_oplock(files_struct *fsp)
 {
struct smbd_server_connection *sconn = fsp->conn->sconn;
struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
-   bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) && koplocks;
+   bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) &&
+   (koplocks != NULL);
 
if ((fsp->oplock_type != NO_OPLOCK) &&
use_kernel) {
@@ -130,13 +132,15 @@ static void downgrade_file_oplock(files_struct *fsp)
 {
struct smbd_server_connection *sconn = fsp->conn->sconn;
struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
+   bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) &&
+   (koplocks != NULL);
 
if (!EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
DEBUG(0, ("trying to downgrade an already-downgraded 
oplock!\n"));
return;
}
 
-   if (koplocks) {
+   if (use_kernel) {
koplocks->ops->release_oplock(koplocks, fsp, LEVEL_II_OPLOCK);
}
fsp->oplock_type = LEVEL_II_OPLOCK;
@@ -728,12 +732,14 @@ static void add_oplock_timeout_handler(files_struct *fsp)
 {
struct smbd_server_connection *sconn = fsp->conn->sconn;
struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
+   bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) &&
+   (koplocks != NULL);
 
/*
 * If kernel oplocks already notifies smbds when an oplock break times
 * out, just return.
 */
-   if (koplocks &&
+   if (use_kernel &&
(koplocks->flags & KOPLOCKS_TIMEOUT_NOTIFICATION)) {
return;
}
@@ -844,7 +850,8 @@ static void process_oplock_break_message(struct 
messaging_context *msg_ctx,
break_to &= ~SMB2_LEASE_READ;
}
 
-   use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) && koplocks;
+   use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) &&
+   (koplocks != NULL);
if (use_kernel && !(koplocks->flags & KOPLOCKS_LEVEL2_SUPPORTED)) {
DEBUG(10, ("Kernel oplocks don't allow level2\n"));
break_to &= ~SMB2_LEASE_READ;
@@ -1254,8 +1261,10 @@ void smbd_contend_level2_oplocks_begin(files_struct *fsp,
 {
struct smbd_server_connection *sconn = fsp->conn->sconn;
struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
+   bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) &&
+   (koplocks != NULL);
 
-   if (koplocks && koplocks->ops->contend_level2_oplocks_begin) {
+   if (use_kernel && koplocks->ops->contend_level2_oplocks_begin) {
koplocks->ops->contend_level2_oplocks_begin(fsp, type);