[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 79f5d05 ctdb-tools: Remove duplicate code via b71becc ctdb-scripts: Ignore shellcheck SC2181 warning (use of $?) via 2b0e266 ctdb-tools: Avoid shellcheck SC2181 warnings (use of $?) in onnode via aa12ea7 ctdb-tools: Use a clear and readable if-statement via 4dc41cd ctdb-tools: Reformat and explain complex code via 3654694 ctdb-tools: Avoid shellcheck SC2188 warning (redirect without command) via db014a5 ctdb-scripts: Avoid shellcheck warning SC2188 (redirect without command) via b171c09 ctdb-tests: Indentation fixups via e8c5d0e ctdb-tests: Fix logic to handle PATH additions for tests via 661426d ctdb-tests: Move die() function to top of script via ac1b1d8 ctdb-tests: run_tests.sh sets evironment variable CTDB_TEST_DIR from e2c0fd3 blackbox: Add test for 'net ads changetrustpw' https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 79f5d058469c62b92b5e6227230597a30b41353a Author: Martin Schwenke Date: Thu Aug 10 20:23:09 2017 +1000 ctdb-tools: Remove duplicate code These lines are duplicates of those above. It has always been this way... Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Mon Aug 14 09:00:45 CEST 2017 on sn-devel-144 commit b71becc1501f70f26ab854460d6f833d8f4b5302 Author: Martin Schwenke Date: Fri Aug 11 12:49:32 2017 +1000 ctdb-scripts: Ignore shellcheck SC2181 warning (use of $?) Given the size of the command substitutions it would be less clear to embed the assignments and substitutions inside a conditional. It is clearer if the exit code is checked afterwards. However, do fix some untidy uses of != instead of -ne when comparing with $?. Make the code easier to understand by reversing the logic and using -eq and ||. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs commit 2b0e266d07cf62c1cbbda182aae6cdc93777cb3b Author: Martin Schwenke Date: Thu Jul 13 12:58:33 2017 +1000 ctdb-tools: Avoid shellcheck SC2181 warnings (use of $?) in onnode Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs commit aa12ea77937b17c2c84cd5fce94f946d0e55f91f Author: Martin Schwenke Date: Fri Aug 11 14:06:30 2017 +1000 ctdb-tools: Use a clear and readable if-statement This is consistent with the if-statement above. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs commit 4dc41cd2b636030e21991685788480a0ea0cdaa1 Author: Martin Schwenke Date: Wed Aug 9 17:11:18 2017 +1000 ctdb-tools: Reformat and explain complex code There are multiple command groups and redirects on very long lines. Reformat the long lines to break them up and add a comment to explain what is happening. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs commit 3654694a092b15733bd04631786e60627c392c6a Author: Martin Schwenke Date: Thu Jul 13 13:08:39 2017 +1000 ctdb-tools: Avoid shellcheck SC2188 warning (redirect without command) Shellcheck found a bug! Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs commit db014a51295ca66f4aee058dd8ee63f0beea5527 Author: Martin Schwenke Date: Thu Jul 13 12:52:39 2017 +1000 ctdb-scripts: Avoid shellcheck warning SC2188 (redirect without command) This makes the code look deliberate instead like something has been accidentally omitted. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs commit b171c090ec9236f1e23d71fdce13656121d21ce6 Author: Martin Schwenke Date: Thu Aug 3 21:01:59 2017 +1000 ctdb-tests: Indentation fixups The rest of the code in this file now matches the coding guidelines, so clean up the rest. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs commit e8c5d0e25e850d9a5f2fbd6b95b38deabedc0c64 Author: Martin Schwenke Date: Wed Mar 15 15:50:46 2017 +1100 ctdb-tests: Fix logic to handle PATH additions for tests When using non-standard test subdirectories, the current code can fail to find the test bin directory and stupidly just adds /bin to PATH. Switch to using CTDB_TESTS_ARE_INSTALLED along with some sanity checks to determine the mode of operation. With this change, test directories can now be created as subdirectories of arbitrary component directories. Tests can then be run directly, either by specifying the subdirectory or individual test cases. Integration into the top-level tests/ directory is then done via a symbolic link, which enables 2 things: * Ability to run a directory of test cases from top level by simply specifying the link name. * Ease of inst
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/2017-08-14-1216/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2017-08-14-1216/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2017-08-14-1216/samba.stdout The top commit at the time of the failure was: commit 79f5d058469c62b92b5e6227230597a30b41353a Author: Martin Schwenke Date: Thu Aug 10 20:23:09 2017 +1000 ctdb-tools: Remove duplicate code These lines are duplicates of those above. It has always been this way... Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Mon Aug 14 09:00:45 CEST 2017 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via df41818 ctdb-daemon: Drop the implementation of CHECK_SRVIDS control via 0772cf4 ctdb-protocol: Drop unused protocol data structures via 66694d8 ctdb-protocol: Drop marshalling code for CHECK_SRVIDS control via 4041cd7 ctdb-client: Drop client code to send CHECK_SRVIDS control via 31c2d0a ctdb-tools: Drop check_srvids command from ctdb tool via 0f424a1 ctdb-protocol: Mark CTDB_CONTROL_CHECK_SRVIDS obsolete via 578a1b1 ctdb-client: Server id exists should check if the pid still exists from 79f5d05 ctdb-tools: Remove duplicate code https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit df41818bef4f980313120f8a6f58dc8be7dddbd9 Author: Amitay Isaacs Date: Thu Aug 10 14:50:02 2017 +1000 ctdb-daemon: Drop the implementation of CHECK_SRVIDS control Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Mon Aug 14 13:00:16 CEST 2017 on sn-devel-144 commit 0772cf45b4ba52f7d16eafc5597edab44edd3590 Author: Amitay Isaacs Date: Fri Aug 4 14:30:41 2017 +1000 ctdb-protocol: Drop unused protocol data structures Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke commit 66694d89262acd9ce4ed50df935f7ac4b39ae7c9 Author: Amitay Isaacs Date: Fri Aug 4 14:27:26 2017 +1000 ctdb-protocol: Drop marshalling code for CHECK_SRVIDS control Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke commit 4041cd759482260b8579a85faf4b9370308b99f1 Author: Amitay Isaacs Date: Fri Aug 4 14:25:04 2017 +1000 ctdb-client: Drop client code to send CHECK_SRVIDS control Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke commit 31c2d0af04aba6974fd69e1b8a7f21d8d34e5c0a Author: Amitay Isaacs Date: Fri Aug 4 14:24:33 2017 +1000 ctdb-tools: Drop check_srvids command from ctdb tool Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke commit 0f424a118813c9f0afc060bdc39a4f0b84eeb6e3 Author: Amitay Isaacs Date: Fri Aug 4 14:06:25 2017 +1000 ctdb-protocol: Mark CTDB_CONTROL_CHECK_SRVIDS obsolete Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke commit 578a1b1757687719c49772fc43a1ac89c6c846ad Author: Amitay Isaacs Date: Fri Aug 4 14:22:31 2017 +1000 ctdb-client: Server id exists should check if the pid still exists This matches what the older client code and samba does. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- Summary of changes: ctdb/client/client_control_sync.c | 42 --- ctdb/client/client_sync.h | 5 --- ctdb/client/client_util.c | 10 ++--- ctdb/client/ctdb_client.c | 37 - ctdb/doc/ctdb.1.xml | 19 - ctdb/include/ctdb_client.h| 3 -- ctdb/include/ctdb_private.h | 2 - ctdb/protocol/protocol.h | 14 +-- ctdb/protocol/protocol_api.h | 6 --- ctdb/protocol/protocol_client.c | 27 ctdb/protocol/protocol_control.c | 8 ctdb/protocol/protocol_private.h | 10 - ctdb/protocol/protocol_types.c| 78 --- ctdb/server/ctdb_control.c| 2 +- ctdb/server/ctdb_daemon.c | 31 -- ctdb/tests/src/protocol_client_test.c | 9 ctdb/tests/src/protocol_types_test.c | 62 ctdb/tools/ctdb.c | 40 -- 18 files changed, 7 insertions(+), 398 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/client/client_control_sync.c b/ctdb/client/client_control_sync.c index 43a941d..fd31823 100644 --- a/ctdb/client/client_control_sync.c +++ b/ctdb/client/client_control_sync.c @@ -2194,48 +2194,6 @@ int ctdb_ctrl_set_db_readonly(TALLOC_CTX *mem_ctx, struct tevent_context *ev, return 0; } -int ctdb_ctrl_check_srvids(TALLOC_CTX *mem_ctx, struct tevent_context *ev, - struct ctdb_client_context *client, - int destnode, struct timeval timeout, - uint64_t *srvid, int count, uint8_t **result) -{ - struct ctdb_uint64_array srvid_list; - struct ctdb_uint8_array *u8_array; - struct ctdb_req_control request; - struct ctdb_reply_control *reply; - int ret; - - srvid_list.num = count; - srvid_list.val = srvid; - - ctdb_req_control_check_srvids(&request, &srvid_list); - ret = ctdb_client_control(mem_ctx, ev, client, destnode, timeout, - &request, &reply); - if (ret != 0) { - DEBUG(DEBUG_ERR, - ("Control
[SCM] Samba Shared Repository - branch v4-7-test updated
The branch, v4-7-test has been updated via 11a6fd3 source3/client: Fix typo in help message displayed by default via d7ab149 vfs_fruit: factor out common code from ad_get() and ad_fget() via 67649b7 vfs_fruit: return fake pipe fd in fruit_open_meta_netatalk() via 6f00dc7 vfs_fruit: don't open basefile in ad_open() and simplify API via dafa192 vfs_fruit: use path based setxattr call in ad_fset() via 4a742a6 s4/torture: additional tests for kernel-oplocks via 60a551e s4/torture: reproducer for kernel oplocks issue with streams via a89dca2 vfs_streams_xattr: return a fake fd in streams_xattr_open() via 715bae3 vfs_streams_xattr: implement all missing handle based VFS functions via 577a3c1 vfs_streams_xattr: always pass NULL as fsp arg to get_ea_value() via cc0ada5 vfs_streams_xattr: remove fsp argument from get_xattr_size() via 2987e49 vfs_streams_xattr: remove all uses of fd, use name based functions via a0727ee vfs_streams_xattr: invalidate stat info if xattr was not found via ca32a25 s3: torture: Add a test for cli_setpathinfo_basic() to smbtorture3. via 4cc812b s3: libsmb: Implement cli_smb2_setatr() by calling cli_smb2_setpathinfo(). via a899335 s3: libsmb: Add cli_smb2_setpathinfo(), to be called by cli_setpathinfo_basic(). via 527d1aa s3: libsmbclient: Fix cli_setpathinfo_basic() to treat mode == -1 as no change. from 53643ac vfs_gpfs: handle EACCES when fetching DOS attributes from xattr https://git.samba.org/?p=samba.git;a=shortlog;h=v4-7-test - Log - commit 11a6fd32c36ff7159445a871fd97b3b80d1f7ae6 Author: Anoop C S Date: Mon Jul 31 15:39:19 2017 +0530 source3/client: Fix typo in help message displayed by default BUG: https://bugzilla.samba.org/show_bug.cgi?id=12936 Signed-off-by: Anoop C S Reviewed-by: Volker Lendecke Reviewed-by: Andreas Schneider (cherry picked from commit 90487259e365d5b966ccc47ac51eadb4733f3197) Autobuild-User(v4-7-test): Karolin Seeger Autobuild-Date(v4-7-test): Mon Aug 14 14:35:34 CEST 2017 on sn-devel-144 commit d7ab149b68d84ed58cd69af607c451e5c70feebd Author: Ralph Boehme Date: Wed May 24 09:17:19 2017 +0200 vfs_fruit: factor out common code from ad_get() and ad_fget() As a result of the previous changes ad_get() and ad_fget() do completey the same, so factor out the common code to a new helper function. No change in behaviour. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791 Signed-off-by: Ralph Boehme Reviewed-by: Richard Sharpe Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Wed Aug 9 22:33:36 CEST 2017 on sn-devel-144 (cherry picked from commit d55c27abc5a7357f740c7065bbe12e7f36b57125) commit 67649b72d551d95d8fefc0f417d295be7a9c29ce Author: Ralph Boehme Date: Tue May 23 17:44:16 2017 +0200 vfs_fruit: return fake pipe fd in fruit_open_meta_netatalk() Do not open the basefile, that conflict with "kernel oplocks = yes". We just return a fake file fd based on dup'ing a pipe fd and ensure all VFS functions that go through vfs_fruit and work on the metadata stream can deal with it. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791 Signed-off-by: Ralph Boehme Reviewed-by: Richard Sharpe Reviewed-by: Volker Lendecke (cherry picked from commit 7583ee6e1c558067e4c7a7351085fcc0e4240366) commit 6f00dc7f9e9b14d0a018c22f75115d35e7cb22ad Author: Ralph Boehme Date: Tue May 23 17:31:47 2017 +0200 vfs_fruit: don't open basefile in ad_open() and simplify API We never need an fd on the basefile when operating on the metadata, as we can always use path based syscalls. Opening the basefile conflicts with "kernel oplocks" so just don't do it. Additional changes: - remove the adouble_type_t argument to ad_open(), the type is passed and set when allocating a struct adouble with ad_alloc() - additionally pass an optional fsp to ad_open() (so the caller can pass NULL). With this change we can move the fd inheritance from fsp to ad into ad_open() itself where it belongs and remove it from the caller ad_fget() Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791 Signed-off-by: Ralph Boehme Reviewed-by: Richard Sharpe (cherry picked from commit e92a39255e66f655e2758f0a71a01eaf258cf711) commit dafa1922d161255ae340b8ef6f9c23f04bad0523 Author: Ralph Boehme Date: Tue May 23 17:39:46 2017 +0200 vfs_fruit: use path based setxattr call in ad_fset() This allows later commits to remove opening of the basefile which conflict with "kernel oplocks = yes". Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791 Signed-off-by: Ralph Boehme
[SCM] Samba Shared Repository - branch v4-5-test updated
The branch, v4-5-test has been updated via 2339d4b vfs_fruit: factor out common code from ad_get() and ad_fget() via b559efc vfs_fruit: return fake pipe fd in fruit_open_meta_netatalk() via 379dbb5 vfs_fruit: don't open basefile in ad_open() and simplify API via d6c9916 vfs_fruit: use path based setxattr call in ad_fset() via 12c818b s4/torture: additional tests for kernel-oplocks via c03af9f s4/torture: reproducer for kernel oplocks issue with streams via 38d8b62 vfs_streams_xattr: return a fake fd in streams_xattr_open() via f7e96ae vfs_streams_xattr: implement all missing handle based VFS functions via 62c9719 vfs_streams_xattr: always pass NULL as fsp arg to get_ea_value() via 10b04e9 vfs_streams_xattr: remove fsp argument from get_xattr_size() via c642283 vfs_streams_xattr: remove all uses of fd, use name based functions via da22be9 vfs_streams_xattr: invalidate stat info if xattr was not found via 715e1c9 s3: torture: Add a test for cli_setpathinfo_basic() to smbtorture3. via 57f129b s3: libsmb: Implement cli_smb2_setatr() by calling cli_smb2_setpathinfo(). via a6f4924 s3: libsmb: Add cli_smb2_setpathinfo(), to be called by cli_setpathinfo_basic(). via bfa7ac0 s3: libsmbclient: Fix cli_setpathinfo_basic() to treat mode == -1 as no change. via ad113e0 vfs_gpfs: handle EACCES when fetching DOS attributes from xattr via c493d8e s3/smbd: handle EACCES when fetching DOS attributes from xattr via 5b3f031 s3/smbd: handling of failed DOS attributes reading via 9792ec2 s3: libsmb: Reverse sense of 'clear all attributes', ignore attribute change in SMB2 to match SMB1. from 3475d11 vfs_ceph: fix cephwrap_chdir() https://git.samba.org/?p=samba.git;a=shortlog;h=v4-5-test - Log - commit 2339d4bc05e65d871cd19a58ef4f28bb1e46cad8 Author: Ralph Boehme Date: Wed May 24 09:17:19 2017 +0200 vfs_fruit: factor out common code from ad_get() and ad_fget() As a result of the previous changes ad_get() and ad_fget() do completey the same, so factor out the common code to a new helper function. No change in behaviour. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791 Signed-off-by: Ralph Boehme Reviewed-by: Richard Sharpe Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Wed Aug 9 22:33:36 CEST 2017 on sn-devel-144 (backported from commit d55c27abc5a7357f740c7065bbe12e7f36b57125) Autobuild-User(v4-5-test): Karolin Seeger Autobuild-Date(v4-5-test): Mon Aug 14 14:52:17 CEST 2017 on sn-devel-144 commit b559efc42bb736b12c5fac4e92d4301486f48f3d Author: Ralph Boehme Date: Tue May 23 17:44:16 2017 +0200 vfs_fruit: return fake pipe fd in fruit_open_meta_netatalk() Do not open the basefile, that conflict with "kernel oplocks = yes". We just return a fake file fd based on dup'ing a pipe fd and ensure all VFS functions that go through vfs_fruit and work on the metadata stream can deal with it. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791 Signed-off-by: Ralph Boehme Reviewed-by: Richard Sharpe Reviewed-by: Volker Lendecke (backported from commit 7583ee6e1c558067e4c7a7351085fcc0e4240366) commit 379dbb5fe8c05d6bea0d332e0395bb07c0c5b07a Author: Ralph Boehme Date: Tue May 23 17:31:47 2017 +0200 vfs_fruit: don't open basefile in ad_open() and simplify API We never need an fd on the basefile when operating on the metadata, as we can always use path based syscalls. Opening the basefile conflicts with "kernel oplocks" so just don't do it. Additional changes: - remove the adouble_type_t argument to ad_open(), the type is passed and set when allocating a struct adouble with ad_alloc() - additionally pass an optional fsp to ad_open() (so the caller can pass NULL). With this change we can move the fd inheritance from fsp to ad into ad_open() itself where it belongs and remove it from the caller ad_fget() Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791 Signed-off-by: Ralph Boehme Reviewed-by: Richard Sharpe (backported from commit e92a39255e66f655e2758f0a71a01eaf258cf711) commit d6c991628ba68341acc84540a3f8a15e0336e00b Author: Ralph Boehme Date: Tue May 23 17:39:46 2017 +0200 vfs_fruit: use path based setxattr call in ad_fset() This allows later commits to remove opening of the basefile which conflict with "kernel oplocks = yes". Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791 Signed-off-by: Ralph Boehme Reviewed-by: Richard Sharpe Reviewed-by: Volker Lendecke (backported from commit aff6fc49f4ac244aef162200a37bd846719e1e4f) commit 12c818b642ba19c4d9edca803e21cc786bb4d
[SCM] Samba Shared Repository - branch v4-6-test updated
The branch, v4-6-test has been updated via ba9c6fb vfs_fruit: factor out common code from ad_get() and ad_fget() via 4afdcbf vfs_fruit: return fake pipe fd in fruit_open_meta_netatalk() via 4d7835f vfs_fruit: don't open basefile in ad_open() and simplify API via f608905 vfs_fruit: use path based setxattr call in ad_fset() via 534ee86 s4/torture: additional tests for kernel-oplocks via c3177ac s4/torture: reproducer for kernel oplocks issue with streams via ef7ce21 vfs_streams_xattr: return a fake fd in streams_xattr_open() via d811440 vfs_streams_xattr: implement all missing handle based VFS functions via 7754581 vfs_streams_xattr: always pass NULL as fsp arg to get_ea_value() via 29e8d5c vfs_streams_xattr: remove fsp argument from get_xattr_size() via eddec63 vfs_streams_xattr: remove all uses of fd, use name based functions via 35924ef vfs_streams_xattr: invalidate stat info if xattr was not found via a82411ac s3: torture: Add a test for cli_setpathinfo_basic() to smbtorture3. via 0a2ea71 s3: libsmb: Implement cli_smb2_setatr() by calling cli_smb2_setpathinfo(). via 426c863 s3: libsmb: Add cli_smb2_setpathinfo(), to be called by cli_setpathinfo_basic(). via 5386d7f s3: libsmbclient: Fix cli_setpathinfo_basic() to treat mode == -1 as no change. via aafdd59 vfs_gpfs: handle EACCES when fetching DOS attributes from xattr via d909d99 s3/smbd: handle EACCES when fetching DOS attributes from xattr via e934f02 s3/smbd: handling of failed DOS attributes reading via 20ec061 s3: libsmb: Reverse sense of 'clear all attributes', ignore attribute change in SMB2 to match SMB1. from 0effa0f VERSION: Bump version up to 4.6.8... https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test - Log - commit ba9c6fb379c706981c1171ed7e46c87eccf21427 Author: Ralph Boehme Date: Wed May 24 09:17:19 2017 +0200 vfs_fruit: factor out common code from ad_get() and ad_fget() As a result of the previous changes ad_get() and ad_fget() do completey the same, so factor out the common code to a new helper function. No change in behaviour. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791 Signed-off-by: Ralph Boehme Reviewed-by: Richard Sharpe Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Wed Aug 9 22:33:36 CEST 2017 on sn-devel-144 (backported from commit d55c27abc5a7357f740c7065bbe12e7f36b57125) Autobuild-User(v4-6-test): Karolin Seeger Autobuild-Date(v4-6-test): Mon Aug 14 18:31:59 CEST 2017 on sn-devel-144 commit 4afdcbfcd138243ac23e39072cba6df4b6bfac80 Author: Ralph Boehme Date: Tue May 23 17:44:16 2017 +0200 vfs_fruit: return fake pipe fd in fruit_open_meta_netatalk() Do not open the basefile, that conflict with "kernel oplocks = yes". We just return a fake file fd based on dup'ing a pipe fd and ensure all VFS functions that go through vfs_fruit and work on the metadata stream can deal with it. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791 Signed-off-by: Ralph Boehme Reviewed-by: Richard Sharpe Reviewed-by: Volker Lendecke (backported from commit 7583ee6e1c558067e4c7a7351085fcc0e4240366) commit 4d7835f64801ee6ac373bd7f1069590b4eee4c3c Author: Ralph Boehme Date: Tue May 23 17:31:47 2017 +0200 vfs_fruit: don't open basefile in ad_open() and simplify API We never need an fd on the basefile when operating on the metadata, as we can always use path based syscalls. Opening the basefile conflicts with "kernel oplocks" so just don't do it. Additional changes: - remove the adouble_type_t argument to ad_open(), the type is passed and set when allocating a struct adouble with ad_alloc() - additionally pass an optional fsp to ad_open() (so the caller can pass NULL). With this change we can move the fd inheritance from fsp to ad into ad_open() itself where it belongs and remove it from the caller ad_fget() Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791 Signed-off-by: Ralph Boehme Reviewed-by: Richard Sharpe (backported from commit e92a39255e66f655e2758f0a71a01eaf258cf711) commit f6089059301d948aa8d6f69801f3e5fd56893b0e Author: Ralph Boehme Date: Tue May 23 17:39:46 2017 +0200 vfs_fruit: use path based setxattr call in ad_fset() This allows later commits to remove opening of the basefile which conflict with "kernel oplocks = yes". Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791 Signed-off-by: Ralph Boehme Reviewed-by: Richard Sharpe Reviewed-by: Volker Lendecke (backported from commit aff6fc49f4ac244aef162200a37bd846719e1e4f) commit 534ee869f7bf5b147c745858a7ba2f
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f816de5 s4: com: Replace erroneous inclusion of internal talloc.h header with external. from df41818 ctdb-daemon: Drop the implementation of CHECK_SRVIDS control https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f816de5636bb17ab09dd4b9c3e5b0249dc9b186f Author: Jeremy Allison Date: Mon Aug 14 13:02:30 2017 -0700 s4: com: Replace erroneous inclusion of internal talloc.h header with external. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12932 Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Aug 15 08:06:40 CEST 2017 on sn-devel-144 --- Summary of changes: source4/lib/com/com.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/source4/lib/com/com.h b/source4/lib/com/com.h index e6be311..56cd210 100644 --- a/source4/lib/com/com.h +++ b/source4/lib/com/com.h @@ -20,8 +20,8 @@ #ifndef __SAMBA_COM_H__ #define __SAMBA_COM_H__ +#include #include "librpc/gen_ndr/misc.h" -#include "lib/talloc/talloc.h" struct com_context; struct tevent_context; -- Samba Shared Repository