[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f1b42ec smbd: Fix snapshot query on shares with DFS enabled via b6931d5 selftest: add tests for dfree with inherit owner enabled via f20d57e selftest: refactor test_dfree_quota.sh - add share parameter via ea73bcd smbd: use owner uid for free disk calculation if owner is inherited via bd2ec88 smbd: get a valid file stat to disk_quotas via 3e6ea02 quotas: small cleanup from 1c10c85 ctdb: Fix the O3 developer build on RHEL7 https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f1b42ec778e08875e076df7fdf67dd69bf9b2757 Author: Christof SchmittDate: Fri Aug 12 14:59:07 2016 -0700 smbd: Fix snapshot query on shares with DFS enabled When DFS is enabled (host msdfs = yes and msdfs root = yes), then SMB clients send create requests in the format \hostname\service\path. Putting the GMT tag as first element breaks the DFS parsing and results in OBJECT_NOT_FOUND for snapshotted files. Fix this by appending the GMT tag to the end of the path. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12150 Signed-off-by: Christof Schmitt Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Aug 13 05:44:39 CEST 2016 on sn-devel-144 commit b6931d5edc381d64ba0fbcd85538cd65e90a2560 Author: Uri Simchoni Date: Thu Aug 11 23:54:22 2016 +0300 selftest: add tests for dfree with inherit owner enabled BUG: https://bugzilla.samba.org/show_bug.cgi?id=12145 Signed-off-by: Uri Simchoni Reviewed-by: Jeremy Allison commit f20d57eceacccb365892dec816cbe57e2ddda8b9 Author: Uri Simchoni Date: Wed Jan 20 21:54:24 2016 +0200 selftest: refactor test_dfree_quota.sh - add share parameter Add a share parameter to individual disk-free tests. This will allow running tests on shares other than dfq share. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12145 Signed-off-by: Uri Simchoni Reviewed-by: Jeremy Allison commit ea73bcd87b6113f77ccda683d15b5a39003b8eaa Author: Uri Simchoni Date: Thu Aug 11 23:37:42 2016 +0300 smbd: use owner uid for free disk calculation if owner is inherited If "inherit owner" is enabled, then new files created under a directory shall consume the quota of the directory's owner, so the free disk calculation should take that quota into account, not the quota of the user creating the file. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12145 Signed-off-by: Uri Simchoni Reviewed-by: Jeremy Allison commit bd2ec88dca692c239397891bd35c9fa6b8e7b51a Author: Uri Simchoni Date: Thu Jan 14 00:09:36 2016 +0200 smbd: get a valid file stat to disk_quotas Most calls to disk_quotas originate at a state with an open file descriptor. Pass the file's stat info down to disk_quota, so that we can avoid extra stat's and the related error handling. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12145 Signed-off-by: Uri Simchoni Reviewed-by: Jeremy Allison commit 3e6ea02d4258a782482eee9f9124c6a39b74a965 Author: Uri Simchoni Date: Wed Jan 27 08:12:20 2016 +0200 quotas: small cleanup Remove an internal function from proto.h Signed-off-by: Uri Simchoni Reviewed-by: Jeremy Allison --- Summary of changes: selftest/target/Samba3.pm| 21 ++-- source3/modules/vfs_ceph.c | 5 +- source3/modules/vfs_default.c| 5 +- source3/script/tests/test_dfree_quota.sh | 84 ++-- source3/selftest/tests.py| 2 +- source3/smbd/dfree.c | 16 +++--- source3/smbd/proto.h | 16 +++--- source3/smbd/quotas.c| 55 ++--- source3/smbd/reply.c | 13 - source3/smbd/smb2_create.c | 6 +-- source3/smbd/trans2.c| 12 ++--- source3/smbd/vfs.c | 4 +- 12 files changed, 155 insertions(+), 84 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index a0996a8..8fc3204 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -614,6 +614,7 @@ sub setup_fileserver($$) push(@dirs, $dfree_share_dir); push(@dirs, "$dfree_share_dir/subdir1"); push(@dirs, "$dfree_share_dir/subdir2"); +
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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-104/2016-08-13-0407/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-13-0407/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-13-0407/samba.stdout The top commit at the time of the failure was: commit 1c10c85939d8dfa5009736e8c8633a3b58712436 Author: Volker LendeckeDate: Fri Aug 12 13:18:19 2016 +0200 ctdb: Fix the O3 developer build on RHEL7 Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Aug 13 00:55:02 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 1c10c85 ctdb: Fix the O3 developer build on RHEL7 from 89a2462 vfs_gpfs: Load nfs4 acl params at tcon time https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1c10c85939d8dfa5009736e8c8633a3b58712436 Author: Volker LendeckeDate: Fri Aug 12 13:18:19 2016 +0200 ctdb: Fix the O3 developer build on RHEL7 Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Aug 13 00:55:02 CEST 2016 on sn-devel-144 --- Summary of changes: ctdb/tools/ctdb.c | 2 ++ 1 file changed, 2 insertions(+) Changeset truncated at 500 lines: diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index e52121d..2cb699a 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -4761,6 +4761,8 @@ static int control_scriptstatus(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, } valid = false; + end = 0; + for (i=0; i
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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-104/2016-08-13-0007/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-13-0007/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-13-0007/samba.stdout The top commit at the time of the failure was: commit 89a24622e738c5e31042e299d93682789d80f4fe Author: Volker LendeckeDate: Tue Aug 9 11:38:43 2016 +0200 vfs_gpfs: Load nfs4 acl params at tcon time This reduces user-space CPU for metadata intensive workloads, lp_parm_* is expensive doing lots of strwicmp. Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Fri Aug 12 21:03:36 CEST 2016 on sn-devel-144
autobuild[sn-devel-144]: intermittent test failure detected
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/2016-08-12-2234/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2016-08-12-2234/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2016-08-12-2234/samba.stdout The top commit at the time of the failure was: commit e7ad8727be6d947f31ca2ca9bfee81b2a34f25a5 Author: Douglas BagnallDate: Fri Aug 12 11:50:07 2016 +1200 KCC: Fix misnamed variable in DSA object Found by Garming. Unlikely to affect anyone. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12143 Pair-programmed-with: Garming Sam Signed-off-by: Douglas Bagnall Signed-off-by: Garming Sam Autobuild-User(master): Douglas Bagnall Autobuild-Date(master): Fri Aug 12 08:20:31 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 89a2462 vfs_gpfs: Load nfs4 acl params at tcon time via 519b10e nfs4acls: Allow nfs4 acl params to be set by callers via d982ea5 nfs4acls: Make smbacl4_vfs_params public via e3523c8 nfs4acls: Add "smbacl4_vfs_params" parameter to smb_set_nt_acl_nfs4 via 02882b4 nfs4acls: Add "smbacl4_vfs_params" parameter to smb_get_nt_acl_nfs4 via fbddf56 nfs4acls: Add "smbacl4_vfs_params" parameter to smb_fget_nt_acl_nfs4 via 41bb898 nfs4acls: Add some const via baaf4e3 nfs4acls: Remove a typedef from e7ad872 KCC: Fix misnamed variable in DSA object https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 89a24622e738c5e31042e299d93682789d80f4fe Author: Volker LendeckeDate: Tue Aug 9 11:38:43 2016 +0200 vfs_gpfs: Load nfs4 acl params at tcon time This reduces user-space CPU for metadata intensive workloads, lp_parm_* is expensive doing lots of strwicmp. Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Fri Aug 12 21:03:36 CEST 2016 on sn-devel-144 commit 519b10e224356055474a5a03546ccd2479e16db2 Author: Volker Lendecke Date: Tue Aug 9 11:31:12 2016 +0200 nfs4acls: Allow nfs4 acl params to be set by callers Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit d982ea5246a90b630a5e1e51accc04f3690e2429 Author: Volker Lendecke Date: Tue Aug 9 11:28:30 2016 +0200 nfs4acls: Make smbacl4_vfs_params public vfs_gpfs & others will be able to embed this structure in their special config. We could have gone with an anonymous struct and a talloc'ed object, but for my taste this is specialized and hidden enough that it's not worth the indirection. Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit e3523c8d46989ce078b31e212e44952db600ec5e Author: Volker Lendecke Date: Tue Aug 9 11:07:38 2016 +0200 nfs4acls: Add "smbacl4_vfs_params" parameter to smb_set_nt_acl_nfs4 Pure placeholder right now, this will allow vfs modules to load the params in advance Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit 02882b44df9653ac1378bc1d7e279f03b370477c Author: Volker Lendecke Date: Tue Aug 9 11:07:38 2016 +0200 nfs4acls: Add "smbacl4_vfs_params" parameter to smb_get_nt_acl_nfs4 Pure placeholder right now, this will allow vfs modules to load the params in advance Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit fbddf56f17ab0c1cc669e381588e868c23d16fbc Author: Volker Lendecke Date: Tue Aug 9 11:07:38 2016 +0200 nfs4acls: Add "smbacl4_vfs_params" parameter to smb_fget_nt_acl_nfs4 Pure placeholder right now, this will allow vfs modules to load the params in advance. nfs4 acl parameters should not change while a tcon is live, and lp_parm_get_* show up in profiles. Loading the parameters once at tcon time will remove this. Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit 41bb898d0a80079019622c65057132016b19171a Author: Volker Lendecke Date: Tue Aug 9 09:10:19 2016 +0200 nfs4acls: Add some const Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit baaf4e393bed859fd69bb63c814ed00aaac5e3c1 Author: Volker Lendecke Date: Tue Aug 9 09:07:13 2016 +0200 nfs4acls: Remove a typedef Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme --- Summary of changes: source3/modules/nfs4_acls.c | 70 ++--- source3/modules/nfs4_acls.h | 16 + source3/modules/vfs_aixacl2.c | 5 +-- source3/modules/vfs_gpfs.c | 21 +-- source3/modules/vfs_nfs4acl_xattr.c | 9 ++--- source3/modules/vfs_zfsacl.c| 6 ++-- 6 files changed, 81 insertions(+), 46 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 8756285..71f4d8d 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -51,23 +51,11 @@ struct SMB4ACL_T struct SMB4ACE_T*last; }; -enum smbacl4_mode_enum {e_simple=0, e_special=1}; -enum smbacl4_acedup_enum {e_dontcare=0, e_reject=1, e_ignore=2, e_merge=3}; - -typedef struct _smbacl4_vfs_params { -
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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-104/2016-08-12-2006/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-12-2006/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-12-2006/samba.stdout The top commit at the time of the failure was: commit e7ad8727be6d947f31ca2ca9bfee81b2a34f25a5 Author: Douglas BagnallDate: Fri Aug 12 11:50:07 2016 +1200 KCC: Fix misnamed variable in DSA object Found by Garming. Unlikely to affect anyone. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12143 Pair-programmed-with: Garming Sam Signed-off-by: Douglas Bagnall Signed-off-by: Garming Sam Autobuild-User(master): Douglas Bagnall Autobuild-Date(master): Fri Aug 12 08:20:31 CEST 2016 on sn-devel-144
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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-104/2016-08-12-1607/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-12-1607/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-12-1607/samba.stdout The top commit at the time of the failure was: commit e7ad8727be6d947f31ca2ca9bfee81b2a34f25a5 Author: Douglas BagnallDate: Fri Aug 12 11:50:07 2016 +1200 KCC: Fix misnamed variable in DSA object Found by Garming. Unlikely to affect anyone. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12143 Pair-programmed-with: Garming Sam Signed-off-by: Douglas Bagnall Signed-off-by: Garming Sam Autobuild-User(master): Douglas Bagnall Autobuild-Date(master): Fri Aug 12 08:20:31 CEST 2016 on sn-devel-144
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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-104/2016-08-12-1206/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-12-1206/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-12-1206/samba.stdout The top commit at the time of the failure was: commit e7ad8727be6d947f31ca2ca9bfee81b2a34f25a5 Author: Douglas BagnallDate: Fri Aug 12 11:50:07 2016 +1200 KCC: Fix misnamed variable in DSA object Found by Garming. Unlikely to affect anyone. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12143 Pair-programmed-with: Garming Sam Signed-off-by: Douglas Bagnall Signed-off-by: Garming Sam Autobuild-User(master): Douglas Bagnall Autobuild-Date(master): Fri Aug 12 08:20:31 CEST 2016 on sn-devel-144
[SCM] Socket Wrapper Repository - branch master updated
The branch, master has been updated via 3eee8df swrap: Delay addition of child socket_info_fd into socket_info list via 9278886 swrap: Remove redunant check in swrap_socket via 69b89aa swrap: Simplify swrap_remove_stale by early return from 44f7e09 Bump version to 1.1.7 https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master - Log - commit 3eee8df6964fdca0d22967a5c8d65f934e935f34 Author: Anoop C SDate: Thu Aug 11 20:24:54 2016 +0530 swrap: Delay addition of child socket_info_fd into socket_info list In swrap_accept() we used to add new child socket_info_fd[child_fi] into newly created child socket_info struture[child_si] without considering the fact that we may return early in case of errors from subsequent calls to libc_getsockname() and sockaddr_convert_from_un() during which we free child_fi and child_si and return. So it is better to delay the addition of child_fi into child_si->fds until child_si is completely initialized. Signed-off-by: Anoop C S Reviewed-by: Michael Adam Reviewed-by: Andreas Schneider commit 92788865b636237f761ebd57d02fad0f3c9e03cd Author: Anoop C S Date: Thu Aug 11 20:20:17 2016 +0530 swrap: Remove redunant check in swrap_socket The very same check is also being made inside swrap_remove_stale(). So we can get rid of this early if condition. Pair-programmed-with: Michael Adam Signed-off-by: Anoop C S Signed-off-by: Michael Adam Reviewed-by: Andreas Schneider commit 69b89aa9d0847ba7238963c0dafef41d691c52cd Author: Anoop C S Date: Thu Aug 11 19:27:17 2016 +0530 swrap: Simplify swrap_remove_stale by early return Pair-programmed-with: Michael Adam Signed-off-by: Anoop C S Signed-off-by: Michael Adam Reviewed-by: Andreas Schneider --- Summary of changes: src/socket_wrapper.c | 38 ++ 1 file changed, 18 insertions(+), 20 deletions(-) Changeset truncated at 500 lines: diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index ba289e6..00518c1 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -1469,23 +1469,25 @@ static void swrap_remove_stale(int fd) struct socket_info *si = find_socket_info(fd); struct socket_info_fd *fi; - if (si != NULL) { - for (fi = si->fds; fi; fi = fi->next) { - if (fi->fd == fd) { - SWRAP_LOG(SWRAP_LOG_TRACE, "remove stale wrapper for %d", fd); - SWRAP_DLIST_REMOVE(si->fds, fi); - free(fi); - break; - } + if (si == NULL) { + return; + } + + for (fi = si->fds; fi; fi = fi->next) { + if (fi->fd == fd) { + SWRAP_LOG(SWRAP_LOG_TRACE, "remove stale wrapper for %d", fd); + SWRAP_DLIST_REMOVE(si->fds, fi); + free(fi); + break; } + } - if (si->fds == NULL) { - SWRAP_DLIST_REMOVE(sockets, si); - if (si->un_addr.sun_path[0] != '\0') { - unlink(si->un_addr.sun_path); - } - free(si); + if (si->fds == NULL) { + SWRAP_DLIST_REMOVE(sockets, si); + if (si->un_addr.sun_path[0] != '\0') { + unlink(si->un_addr.sun_path); } + free(si); } } @@ -2456,10 +2458,7 @@ static int swrap_socket(int family, int type, int protocol) } /* Check if we have a stale fd and remove it */ - si = find_socket_info(fd); - if (si != NULL) { - swrap_remove_stale(fd); - } + swrap_remove_stale(fd); si = (struct socket_info *)calloc(1, sizeof(struct socket_info)); if (si == NULL) { @@ -2683,8 +2682,6 @@ static int swrap_accept(int s, child_fi->fd = fd; - SWRAP_DLIST_ADD(child_si->fds, child_fi); - child_si->family = parent_si->family; child_si->type = parent_si->type; child_si->protocol = parent_si->protocol; @@ -2737,6 +2734,7 @@ static int swrap_accept(int s, }; memcpy(_si->myname.sa.ss, _my_addr.sa.ss, in_my_addr.sa_socklen); + SWRAP_DLIST_ADD(child_si->fds, child_fi); SWRAP_DLIST_ADD(sockets, child_si); if (addr != NULL) { -- Socket Wrapper
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via e7ad872 KCC: Fix misnamed variable in DSA object from 5700158 lib: Use replace.h properly in pthreadpool https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e7ad8727be6d947f31ca2ca9bfee81b2a34f25a5 Author: Douglas BagnallDate: Fri Aug 12 11:50:07 2016 +1200 KCC: Fix misnamed variable in DSA object Found by Garming. Unlikely to affect anyone. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12143 Pair-programmed-with: Garming Sam Signed-off-by: Douglas Bagnall Signed-off-by: Garming Sam Autobuild-User(master): Douglas Bagnall Autobuild-Date(master): Fri Aug 12 08:20:31 CEST 2016 on sn-devel-144 --- Summary of changes: python/samba/kcc/kcc_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/python/samba/kcc/kcc_utils.py b/python/samba/kcc/kcc_utils.py index 190b93f..2c3e322 100644 --- a/python/samba/kcc/kcc_utils.py +++ b/python/samba/kcc/kcc_utils.py @@ -564,7 +564,7 @@ class DirectoryServiceAgent(object): self.dsa_ivid = None self.dsa_is_ro = False self.dsa_is_istg = False -self.dsa_options = 0 +self.options = 0 self.dsa_behavior = 0 self.default_dnstr = None # default domain dn string for dsa -- Samba Shared Repository
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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-104/2016-08-12-0807/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-12-0807/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-12-0807/samba.stdout The top commit at the time of the failure was: commit 57001580bb354be086548720b3b0d3c8b6e05642 Author: Volker LendeckeDate: Sun Jul 31 07:42:21 2016 +0200 lib: Use replace.h properly in pthreadpool Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Aug 12 04:26:09 CEST 2016 on sn-devel-144