[SCM] Samba Shared Repository - branch master updated

2019-06-20 Thread Andrew Bartlett
The branch, master has been updated
   via  feb96ee8e55 lib ldb key value: use TALLOC_FREE() per README.Coding
   via  b6b5b5fe355 lib ldb key value: fix index buffering
   via  1a52b03b2f4 lib ldb key value: Remove check_parent from 
ldb_kv_index_idxptr()
   via  201684e59fd lib ldb ldb_key_value tests: Add tests for wrapped 
operations
   via  565341baf53 lib ldb key value: add nested transaction support.
   via  d7dc4fde408 lib ldb key value backends: Add nested txn support
   via  d73bbf0b73f lib ldb tests: remove deprecation warning from api.py
   via  c3aed689896 lib ldb tests: Test nested transactions
  from  e121c14405f provision: Suggest "minimal-responses yes;" by default

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


- Log -
commit feb96ee8e558797d68ad0af669eb9010c0487b9f
Author: Gary Lockyer 
Date:   Fri Jun 21 14:32:08 2019 +1200

lib ldb key value: use TALLOC_FREE() per README.Coding

Signed-off-by: Andrew Bartlett 
Signed-off-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Fri Jun 21 05:45:02 UTC 2019 on sn-devel-184

commit b6b5b5fe355fee2a4096e9214831cb88c7a2a4c6
Author: Gary Lockyer 
Date:   Wed Mar 6 15:28:45 2019 +1300

lib ldb key value: fix index buffering

As a performance enhancement the key value layer maintains a cache of
the index records, which is written to disk as part of a prepare commit.
This patch adds an extra cache at the operation layer to ensure that the
cached indexes remain consistent in the event of an operation failing.

Add test to test for index corruption in a failed modify.

Signed-off-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 
Pair-Programmed-With: Andrew Bartlett 
Signed-off-by: Andrew Bartlett 

commit 1a52b03b2f4c1503b52784f1a01f8291b78e7604
Author: Gary Lockyer 
Date:   Fri Jun 21 14:52:24 2019 +1200

lib ldb key value: Remove check_parent from ldb_kv_index_idxptr()

The callers will soon have two possible parents for this pointer, so
we need to remove this check, which was added out of caution given
the rather strange pattern of putting an active memory pointer into a
TDB (as a hash map).

That is, the only callers that did call this with "true" would
have to call this with "false", so just remove the complexity.

Signed-off-by: Andrew Bartlett 
Signed-off-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit 201684e59fd417ca913cb1d2d099e91b57dace6c
Author: Gary Lockyer 
Date:   Tue Mar 26 12:42:32 2019 +1300

lib ldb ldb_key_value tests: Add tests for wrapped operations

Add test exercising the sub/nested transactions wrapping the key value
operations.

Signed-off-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit 565341baf537c9b3145a882d6a23ad4f155c0036
Author: Gary Lockyer 
Date:   Thu Mar 7 10:37:18 2019 +1300

lib ldb key value: add nested transaction support.

Use the nested transaction support added to the key value back ends to
make key value operations atomic. This will ensure that rename
operation failures, which delete the original record and add a new
record, leave the database in a consistent state.

Signed-off-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit d7dc4fde4080513e2a62fabbdeee546bd74b9a0d
Author: Gary Lockyer 
Date:   Thu Mar 7 10:18:00 2019 +1300

lib ldb key value backends: Add nested txn support

Add limited nested transaction support to the back ends to make the key 
value
operations atomic (for those back ends that support nested transactions).

Note: that only the lmdb backend currently supports nested transactions.

Signed-off-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit d73bbf0b73fcfb99880715df9e314ae5482d6828
Author: Gary Lockyer 
Date:   Wed Mar 6 15:45:54 2019 +1300

lib ldb tests: remove deprecation warning from api.py

Remove the "DeprecationWarning: Please use assertEqual instead."
warnings from api.py

Signed-off-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit c3aed68989662358ba493c1e89968a0eff15b442
Author: Gary Lockyer 
Date:   Wed Mar 6 15:32:08 2019 +1300

lib ldb tests: Test nested transactions

Add a test to document that ldb does not currently support nested
transactions.

Signed-off-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

---

Summary of changes:
 lib/ldb/ldb_key_value/ldb_kv.c | 203 -
 lib/ldb/ldb_key_value/ldb_kv.h |  18 +
 lib/ldb/ldb_key_value/ldb_kv_index.c   | 378 +++--
 lib/ldb/ldb_mdb/ldb_mdb.c  |  33 +
 lib/ldb/ldb_tdb/ldb_tdb.c  

[SCM] Samba Shared Repository - branch master updated

2019-06-20 Thread Andrew Bartlett
The branch, master has been updated
   via  e121c14405f provision: Suggest "minimal-responses yes;" by default
   via  7ee655970d3 README: fix samba mailman list address
   via  8de56ddc92e script/autobuild.py: make code more pythonic
   via  fb12a252613 script/autobuild.py: avoid nested try except block
   via  ae90e5263bd script/autobuild.py: rm redundant empty str in options
   via  04a6967bc39 script/autobuild.py: define cwd for builder and avoid 
chdir
   via  6fc3eb8926a script/autobuild.py: improve run_cmd with check_output
   via  0daeb6046bd script/autobuild.py: add helper functions to simplify 
make test cmd
   via  0383747dcc5 script/autobuild.py: replace random-sleep.sh with 
python function
   via  1b70d43ed1f script/autobuild.py: rm unused mime type text/plain in 
tasks
   via  41d93a6da5b script/autobuild.py: fix tasks indent
   via  33cc2692510 gitlab-ci: Add Fedora 30
   via  b201dd33e04 regfio: Return instead of assert for short blocks
  from  d4ace83baaa smbd: Remove struct blocking_lock_record

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


- Log -
commit e121c14405f9257ef640d2651326f082707cb66f
Author: Andrew Bartlett 
Date:   Thu Jun 20 05:11:41 2019 +1200

provision: Suggest "minimal-responses yes;" by default

This improves Samba AD DC performance as a DNS server dramatically, because 
NS records do not
need to be looked up and there is less risk the response will have to fall 
back
to TCP, doubling the cost again.

Signed-off-by: Andrew Bartlett 
Reviewed-by: Gary Lockyer 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Fri Jun 21 00:52:19 UTC 2019 on sn-devel-184

commit 7ee655970d3d0d2af5e5b4468ea841349a492892
Author: Björn Jacke 
Date:   Thu Jun 20 12:27:46 2019 +0200

README: fix samba mailman list address

Signed-off-by: Bjoern Jacke 
Reviewed-by: Andrew Bartlett 

commit 8de56ddc92ecb3d7607dc7d61dc9e2a623a5e606
Author: Joe Guo 
Date:   Tue May 21 13:56:12 2019 +1200

script/autobuild.py: make code more pythonic

Signed-off-by: Joe Guo 
Reviewed-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit fb12a252613205dd0ebcfc8716847aed510e07cb
Author: Joe Guo 
Date:   Thu May 23 14:07:49 2019 +1200

script/autobuild.py: avoid nested try except block

Signed-off-by: Joe Guo 
Reviewed-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit ae90e5263bd65042b067ab900c83bf310f977dbd
Author: Joe Guo 
Date:   Thu May 23 14:04:18 2019 +1200

script/autobuild.py: rm redundant empty str in options

Signed-off-by: Joe Guo 
Reviewed-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit 04a6967bc393e0305bac9f33a42cceb4eb88f20b
Author: Joe Guo 
Date:   Wed May 22 23:50:01 2019 +1200

script/autobuild.py: define cwd for builder and avoid chdir

We can pass cwd in Popen, no need to chdir for each cmd.

Signed-off-by: Joe Guo 
Reviewed-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit 6fc3eb8926a1618c2acdf80f9b8d5cc213a90e4d
Author: Joe Guo 
Date:   Wed May 22 12:15:40 2019 +1200

script/autobuild.py: improve run_cmd with check_output

Signed-off-by: Joe Guo 
Reviewed-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit 0daeb6046bd9170adac797a7d7227c69aa5e307a
Author: Joe Guo 
Date:   Wed May 22 23:29:56 2019 +1200

script/autobuild.py: add helper functions to simplify make test cmd

Signed-off-by: Joe Guo 
Reviewed-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit 0383747dcc5af4a3832aa938e99df81ae6357c21
Author: Joe Guo 
Date:   Wed May 22 22:34:57 2019 +1200

script/autobuild.py: replace random-sleep.sh with python function

The random-sleep.sh script is tricky, and there is no need to rely on 
another
script just for random sleep.

Using the python function, the random number generation will happen when
load autobuild.py other than execute cmd, but shouldn't affect the
result.

Signed-off-by: Joe Guo 
Reviewed-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit 1b70d43ed1fde70179d7cdb4426bacd1a2ddfc33
Author: Joe Guo 
Date:   Wed May 22 22:17:28 2019 +1200

script/autobuild.py: rm unused mime type text/plain in tasks

The mime type `text/plain` is repeated everywhere but not used any more.

Signed-off-by: Joe Guo 
Reviewed-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit 41d93a6da5b99b72fabe872d124171f6ae5c897f
Author: Joe Guo 
Date:   Wed May 22 22:11:28 2019 +1200

script/autobuild.py: fix tasks indent

Indent tasks at same level, make it easier to copy/move lines arround.

Signed-off-by: Joe Guo 
Reviewed-by: Gary Lockyer 
Reviewed-by: Andrew Bartlett 

commit 33cc2692510d6963ffb33d5cbb4233ef8928
Author: Andreas Schneider 

[SCM] Samba Shared Repository - branch master updated

2019-06-20 Thread Jeremy Allison
The branch, master has been updated
   via  d4ace83baaa smbd: Remove struct blocking_lock_record
  from  4bbe291efcb vfs: Remove SMB_VFS_BRL_CANCEL_WINDOWS

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


- Log -
commit d4ace83baaa47fe36dd4b0ab9472933ef09b4eb6
Author: Volker Lendecke 
Date:   Thu Jun 20 20:58:42 2019 +0200

smbd: Remove struct blocking_lock_record

Forgot that one in the last patches

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

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Thu Jun 20 23:39:34 UTC 2019 on sn-devel-184

---

Summary of changes:
 source3/include/locking.h | 20 
 source3/include/vfs.h |  1 -
 source3/smbd/smb2_lock.c  |  1 -
 3 files changed, 22 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/locking.h b/source3/include/locking.h
index 4cb75202d1a..3e7560bef9e 100644
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -61,26 +61,6 @@ struct lock_struct {
enum brl_flavour lock_flav;
 };
 
-/
- This is the structure to queue to implement blocking locks.
-*/
-
-struct blocking_lock_record {
-   struct blocking_lock_record *next;
-   struct blocking_lock_record *prev;
-   struct files_struct *fsp;
-   struct timeval expire_time;
-   int lock_num;
-   uint64_t offset;
-   uint64_t count;
-   uint64_t smblctx;
-   uint64_t blocking_smblctx; /* Context that blocks us. */
-   enum brl_flavour lock_flav;
-   enum brl_type lock_type;
-   struct smb_request *req;
-   void *blr_private; /* Implementation specific. */
-};
-
 struct smbd_lock_element {
uint64_t smblctx;
enum brl_type brltype;
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 4727fc029da..67cbe758674 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -280,7 +280,6 @@ struct vfs_statvfs_struct;
 struct smb_request;
 struct ea_list;
 struct smb_file_time;
-struct blocking_lock_record;
 struct smb_filename;
 struct dfs_GetDFSReferral;
 
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index cbde4413e69..7d983cc3456 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -42,7 +42,6 @@ struct smbd_smb2_lock_state {
struct smbd_smb2_request *smb2req;
struct smb_request *smb1req;
struct files_struct *fsp;
-   struct blocking_lock_record *blr;
uint16_t lock_count;
struct smbd_lock_element *locks;
 };


-- 
Samba Shared Repository



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

2019-06-20 Thread autobuild
The autobuild test system (on sn-devel-184) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   
https://git.samba.org/autobuild.flakey.sn-devel-184/2019-06-20-2213/flakey.log

The failure seems to be in the "samba-schemaupgrade" suite, whose build logs 
are available here:

   
https://git.samba.org/autobuild.flakey.sn-devel-184/2019-06-20-2213/samba-schemaupgrade.stderr
   
https://git.samba.org/autobuild.flakey.sn-devel-184/2019-06-20-2213/samba-schemaupgrade.stdout
  
The top commit at the time of the failure was:

commit 4bbe291efcb389715651b2eb94330b6c36f83030
Author: Volker Lendecke 
Date:   Thu Jun 20 13:42:12 2019 +0200

vfs: Remove SMB_VFS_BRL_CANCEL_WINDOWS

This is not called anymore, bump the VFS version number in a separate
commit

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

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Thu Jun 20 18:34:20 UTC 2019 on sn-devel-184

and the last 50 lines of the stdout log were:

Applying Sch67.ldf updates...
5 changes applied
Applying Sch68.ldf updates...
30 changes applied
Applying Sch69.ldf updates...
4 changes applied
Schema successfully updated
Replicate from liveupgrade1dc to liveupgrade2dc was successful.
[1(0)/11 at 0s] samba.tests.samba_tool.schema(schema_dc:local)
[2(4)/11 at 2m23s] samba4.schemaInfo.python(schema_dc:local)(schema_dc:local)
[3(7)/11 at 2m29s] samba.tests.dsdb_schema_attributes(schema_dc:local)
[4(13)/11 at 2m46s] samba4.ldap_schema.python(schema_dc)(schema_dc)
[5(39)/11 at 3m29s] samba4.ldap.possibleInferiors.python(schema_dc)(schema_dc)
[6(313)/11 at 3m31s] samba4.ldap.secdesc.python(schema_dc)(schema_dc)
[7(396)/11 at 7m38s] samba4.ldap.acl.python(schema_dc)(schema_dc)
[8(449)/11 at 9m12s] samba4.ldap.passwords.python(schema_dc)(schema_dc)
[9(467)/11 at 9m52s] 
samba4.drs.samba_tool_drs.python(schema_pair_dc)(schema_pair_dc:local)
[10(481)/11 at 13m1s] 
samba4.drs.getnc_schema.python(schema_pair_dc)(schema_pair_dc)
Failed repl, retrying in 10s
UNEXPECTED(failure): 
samba4.drs.getnc_schema.python(schema_pair_dc).getnc_schema.SchemaReplicationTests.test_schema_linked_attributes(schema_pair_dc)
REASON: Exception: Exception: Traceback (most recent call last):
  File 
"/memdisk/autobuild/fl/b3503323/samba-schemaupgrade/source4/torture/drs/python/getnc_schema.py",
 line 290, in test_schema_linked_attributes
self.do_repl(self.schema_dn)
  File 
"/memdisk/autobuild/fl/b3503323/samba-schemaupgrade/source4/torture/drs/python/getnc_schema.py",
 line 66, in do_repl
self.assertCmdSuccess(result, out, err)
  File "bin/python/samba/tests/samba_tool/base.py", line 109, in 
assertCmdSuccess
exit, out, err, msg))
AssertionError: -1 is not None : exit[-1] stdout[] stderr[ERROR(): DsReplicaSync failed - drsException: 
DsReplicaSync failed (1168, 'WERR_NOT_FOUND')
  File "bin/python/samba/netcmd/drs.py", line 574, in run
drs_utils.sendDsReplicaSync(server_bind, server_bind_handle, 
source_dsa_guid, NC, req_options)
  File "bin/python/samba/drs_utils.py", line 92, in sendDsReplicaSync
raise drsException("DsReplicaSync failed %s" % estr)
]:

FAILED (1 failures, 0 errors and 0 unexpected successes in 0 testsuites)

A summary with detailed information can be found in:
  ./bin/ab/summary
TOP 10 slowest tests
samba4.ldap.secdesc.python(schema_dc)(schema_dc) -> 247
samba4.drs.samba_tool_drs.python(schema_pair_dc)(schema_pair_dc:local) -> 189
samba4.ldap.acl.python(schema_dc)(schema_dc) -> 93
samba4.ldap_schema.python(schema_dc)(schema_dc) -> 43
samba4.ldap.passwords.python(schema_dc)(schema_dc) -> 40
samba.tests.dsdb_schema_attributes(schema_dc:local) -> 18
samba.tests.samba_tool.schema(schema_dc:local) -> 11
samba4.schemaInfo.python(schema_dc:local)(schema_dc:local) -> 5
samba4.ldap.possibleInferiors.python(schema_dc)(schema_dc) -> 2
ERROR: test failed with exit code 1
Makefile:16: recipe for target 'test' failed



[SCM] Samba Shared Repository - branch master updated

2019-06-20 Thread Jeremy Allison
The branch, master has been updated
   via  4bbe291efcb vfs: Remove SMB_VFS_BRL_CANCEL_WINDOWS
   via  871bb7562ca smbd: Remove unused brlock code
   via  b3284bef353 smbd: Cancel smbd_smb1_do_locks requests in 
reply_ntcancel
   via  f37c14dd632 smbd: Add a clarifying comment on triggering waiters
   via  d60a35bd75a smbd: Don't call cancel_pending_lock_requests_by_fid on 
close
   via  b091c19cb20 smbd: Base smb2_lock.c on tevent_req
   via  6f204de7784 smbd: Use smbd_smb1_do_locks_send() in 
smb_set_posix_lock()
   via  4c1d574ebea smbd: Use smbd_smb1_do_locks_send() in reply_lockingX()
   via  c4649b3ad6e smbd: Use smbd_smb1_do_locks_send() in reply_lock()
   via  1967bb8538f smbd: Use smbd_smb1_do_locks_send() in reply_lockread()
   via  ab149a611f2 smbd: Remove SMB1 special case handling from brlock.c
   via  2d746d1364e smbd: Ping dbwrap_watch on locking.tdb for in 
smbd_do_unlocking()
   via  fbbf684338d smbd: Add smbd_smb1_do_locks_send/recv()
   via  f0a9459e66b smbd: Slightly simplify smbd_smb2_lock_send()
   via  67f89bb3300 smbd: Return "blocker_pid" from do_lock()
   via  ca73ba859ed smbd: Add some paranoia against NULL dereference
   via  4adbeb9714b smbd: Add "blocker_pid" to brl_lock()
   via  b752e242a6a torture3: Test cancelling locking with ntcancel
   via  56521c5fbf0 libsmb: Make cli_lockingx cancellable
   via  3f6ed6e3523 torture3: Run a blocking lock call with a subsequent 
read
   via  b20231a1abb torture3: Test blocking posix locks
   via  2f1a459b742 torture3: Test LOCKINGX_CANCEL without locks
   via  7dec53ed0c1 torture3: Add a test to block a locking
   via  ff992d1c6c3 smbd: Use smbd_do_unlocking() in reply_unlock()
   via  00b11867253 smbd: Use smbd_do_unlocking() in reply_writeunlock()
   via  865c86bd327 smbd: Use smbd_do_unlocking() in smb_set_posix_lock()
   via  b3d533aa585 smbd: Add "lock_flav" to smbd_do_unlocking()
   via  4d6152b1bfa smbd: Simplify smb_set_posix_lock()
   via  10ba4aa6d5c smbd: Avoid casts in smb_set_posix_lock()
   via  1736f7c5c5e smbd: Use NT_STATUS_IS_OK() in reply_unlock()
   via  041608cb899 smbd: Avoid casts in reply_unlock()
   via  7fe67a47826 lib: Fix a typo
   via  a371d22feb2 smbd: Fix a typo
   via  7fa0be8f63c tevent: Fix a typo
   via  c00c7bfb7e2 smbd: Only remove locks by mid if necessary
  from  7f70e216fcd docs: fix typo in "ntlm auth" doc in smb.conf man page

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


- Log -
commit 4bbe291efcb389715651b2eb94330b6c36f83030
Author: Volker Lendecke 
Date:   Thu Jun 20 13:42:12 2019 +0200

vfs: Remove SMB_VFS_BRL_CANCEL_WINDOWS

This is not called anymore, bump the VFS version number in a separate
commit

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

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Thu Jun 20 18:34:20 UTC 2019 on sn-devel-184

commit 871bb7562cad1d4a9dccab602880d2ef3fffd75c
Author: Volker Lendecke 
Date:   Thu Jun 20 11:07:17 2019 +0200

smbd: Remove unused brlock code

No PENDING locks in brlock.tdb anymore.

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

commit b3284bef3536328ff4ae965b5f34cec8ee9b8a3a
Author: Volker Lendecke 
Date:   Wed Jun 19 22:00:25 2019 +0200

smbd: Cancel smbd_smb1_do_locks requests in reply_ntcancel

Last link to the specialized brlock queue

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

commit f37c14dd63285e108a9fc1050de9b14a288097cb
Author: Volker Lendecke 
Date:   Wed Jun 19 16:08:49 2019 +0200

smbd: Add a clarifying comment on triggering waiters

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

commit d60a35bd75a0c427a593defe8fd3a7850f45ee5f
Author: Volker Lendecke 
Date:   Wed Jun 19 15:49:46 2019 +0200

smbd: Don't call cancel_pending_lock_requests_by_fid on close

We don't use that queue anymore

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

commit b091c19cb2045e72b3a9a0b364f110ad88debe53
Author: Volker Lendecke 
Date:   Sat Jun 15 15:23:50 2019 -0700

smbd: Base smb2_lock.c on tevent_req

smb2 locking is a lot more regular than reply_lockingX. So this is a
much smaller change.

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

commit 6f204de778490c7bffdc367de21d80fb410b227f
Author: Volker Lendecke 
Date:   Fri Jun 14 15:17:12 2019 -0700

smbd: Use smbd_smb1_do_locks_send() in smb_set_posix_lock()

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

commit 4c1d574ebea5138eda1cfbdcab90d25618e0a4f3
Author: Volker Lendecke 
Date:   Thu Jun 13 03:59:54 2019 -0700

smbd: Use smbd_smb1_do_locks_send() in reply_lockingX()

Signed-off-by: Volker 

[SCM] Samba Shared Repository - branch master updated

2019-06-20 Thread Björn Baumbach
The branch, master has been updated
   via  7f70e216fcd docs: fix typo in "ntlm auth" doc in smb.conf man page
   via  83859668d5f docs: add documentation for the samba-tool ntacl 
changedomsid command
  from  6aa5d1f684f CVE-2019-12436 dsdb/paged_results: ignore successful 
results without messages

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


- Log -
commit 7f70e216fcda2ebfbdf952471931f9f3739a6e8e
Author: Björn Baumbach 
Date:   Wed Jun 19 22:35:43 2019 +0200

docs: fix typo in "ntlm auth" doc in smb.conf man page

Thanks to Amit Kumar 

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

Signed-off-by: Björn Baumbach 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Björn Baumbach 
Autobuild-Date(master): Thu Jun 20 17:14:50 UTC 2019 on sn-devel-184

commit 83859668d5f8695134dc6739ef8dec2edc3542ff
Author: Björn Baumbach 
Date:   Wed Jun 19 12:22:01 2019 +0200

docs: add documentation for the samba-tool ntacl changedomsid command

Signed-off-by: Björn Baumbach 
Reviewed-by: Volker Lendecke 

---

Summary of changes:
 docs-xml/manpages/samba-tool.8.xml| 71 +++
 docs-xml/smbdotconf/security/ntlmauth.xml |  2 +-
 2 files changed, 72 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/samba-tool.8.xml 
b/docs-xml/manpages/samba-tool.8.xml
index f94864b07c9..7f8f02d619a 100644
--- a/docs-xml/manpages/samba-tool.8.xml
+++ b/docs-xml/manpages/samba-tool.8.xml
@@ -664,6 +664,77 @@
Manage NT ACLs.
 
 
+
+   ntacl changedomsid 
original-domain-SID 
new-domain-SID file 
[options]
+   Change the domain SID for ACLs.
+   Can be used to change all entries in acl_xattr when the machine's SID
+   has accidentially changed or the data set has been copied
+   to another machine either via backup/restore or rsync.
+
+   
+   
+   --use-ntvfs
+   
+   Set the ACLs directly to the TDB or xattr. The POSIX permissions will
+   NOT be changed, only the NT ACL will be stored.
+   
+   
+
+   
+   --service=SERVICE
+   
+   Specify the name of the smb.conf service to use. This option is
+   required in combination with the --use-s3fs option.
+   
+   
+
+   
+   --use-s3fs
+   
+   Set the ACLs for use with the default s3fs file server via the VFS
+   layer. This option requires a smb.conf service, specified by the
+   --service=SERVICE option.
+   
+   
+
+   
+   --xattr-backend=[native|tdb]
+   
+   Specify the xattr backend type (native fs or tdb).
+   
+   
+
+   
+   --eadb-file=EADB_FILE
+   
+   Name of the tdb file where attributes are stored.
+   
+   
+
+   
+   --recursive
+   
+   Set the ACLs for directories and their contents recursively.
+   
+   
+
+   
+   --follow-symlinks
+   
+   Follow symlinks when --recursive is specified.
+   
+   
+
+   
+   --verbose
+   
+   Verbosely list files and ACLs which are being processed.
+   
+   
+   
+
+
+
 
ntacl get file [options]
Get ACLs on a file.
diff --git a/docs-xml/smbdotconf/security/ntlmauth.xml 
b/docs-xml/smbdotconf/security/ntlmauth.xml
index dd5dbaea117..d22f0644fb2 100644
--- a/docs-xml/smbdotconf/security/ntlmauth.xml
+++ b/docs-xml/smbdotconf/security/ntlmauth.xml
@@ -60,7 +60,7 @@
 
 
 The default changed from yes to
-no with Samba 4.5.  The default chagned again
+no with Samba 4.5. The default changed again
 to ntlmv2-only with Samba 4.7, however the
 behaviour is unchanged.
 


-- 
Samba Shared Repository



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

2019-06-20 Thread autobuild
The autobuild test system (on sn-devel-184) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   
https://git.samba.org/autobuild.flakey.sn-devel-184/2019-06-20-1003/flakey.log

The failure seems to be in the "samba-nt4" suite, whose build logs are 
available here:

   
https://git.samba.org/autobuild.flakey.sn-devel-184/2019-06-20-1003/samba-nt4.stderr
   
https://git.samba.org/autobuild.flakey.sn-devel-184/2019-06-20-1003/samba-nt4.stdout
  
The top commit at the time of the failure was:

commit 6aa5d1f684f6bdbae46508347d093a8def27912a
Author: Douglas Bagnall 
Date:   Fri May 17 14:42:24 2019 +1200

CVE-2019-12436 dsdb/paged_results: ignore successful results without 
messages

So that we don't dereference result->msgs[0] when it doesn't exist.
This can happen when the object has changed in such a way that it no
longer matches the original search query.

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

Signed-off-by: Douglas Bagnall 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): Karolin Seeger 
Autobuild-Date(master): Wed Jun 19 08:16:39 UTC 2019 on sn-devel-184

and the last 50 lines of the stdout log were:

(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:14 2019 UTC(13208090594000) => Wed Sep 18 10:03:14 2019 
UTC(13213274594000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:14 2019 UTC(13208090594000) => Wed Sep 18 10:03:14 2019 
UTC(13213274594000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:14 2019 UTC(13208090594000) => Wed Sep 18 10:03:14 2019 
UTC(13213274594000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:14 2019 UTC(13208090594000) => Wed Sep 18 10:03:14 2019 
UTC(13213274594000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:14 2019 UTC(13208090594000) => Wed Sep 18 10:03:14 2019 
UTC(13213274594000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:14 2019 UTC(13208090594000) => Wed Sep 18 10:03:14 2019 
UTC(13213274594000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:14 2019 UTC(13208090594000) => Wed Sep 18 10:03:14 2019 
UTC(13213274594000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:14 2019 UTC(13208090594000) => Wed Sep 18 10:03:14 2019 
UTC(13213274594000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:16 2019 UTC(13208090596000) => Wed Sep 18 10:03:16 2019 
UTC(13213274596000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:16 2019 UTC(13208090596000) => Wed Sep 18 10:03:16 2019 
UTC(13213274596000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:16 2019 UTC(13208090596000) => Wed Sep 18 10:03:16 2019 
UTC(13213274596000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:16 2019 UTC(13208090596000) => Wed Sep 18 10:03:16 2019 
UTC(13213274596000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:16 2019 UTC(13208090596000) => Wed Sep 18 10:03:16 2019 
UTC(13213274596000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:16 2019 UTC(13208090596000) => Wed Sep 18 10:03:16 2019 
UTC(13213274596000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:16 2019 UTC(13208090596000) => Wed Sep 18 10:03:16 2019 
UTC(13213274596000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:16 2019 UTC(13208090596000) => Wed Sep 18 10:03:16 2019 
UTC(13213274596000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:16 2019 UTC(13208090596000) => Wed Sep 18 10:03:16 2019 
UTC(13213274596000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:16 2019 UTC(13208090596000) => Wed Sep 18 10:03:16 2019 
UTC(13213274596000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:18 2019 UTC(13208090598000) => Wed Sep 18 10:03:18 2019 
UTC(13213274598000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:18 2019 UTC(13208090598000) => Wed Sep 18 10:03:18 2019 
UTC(13213274598000)
(../../source4/torture/smb2/util.c:158) change_time not setup correctly: Sat 
Jul 20 10:03:18 2019 UTC(13208090598000) => Wed Sep 18 10:03:18 2019 
UTC(13213274598000)