[SCM] Samba Shared Repository - branch v4-2-test updated
The branch, v4-2-test has been updated
via 137c096 VERSION: Re-enable git snapshots.
via 3011777 VERSION: Bump version up to 4.2.0rc1...
via 1ef2be6 vfs_fruit: deal with vfs_catia not being loaded
via b2626c2 vfs_fruit: remove redundant assignment
via 04ebed1 vfs_fruit: fix possible uninitialized use
via 26ff9f3 libcli/smb: call smb2cli_validate_negotiate_info*() after
each authenticated tcon
via 7729ba5 libcli/smb: add smb2cli_validate_negotiate_info*()
via 6a82cb7 libcli/smb: list NT_STATUS_FILE_CLOSED as expected ioctl
response.
via a51b623 s4:libcli/tcon: remove unused smb2_tree_connect*()
via 609b31a s4:torture/smb2: remove unused variable in
torture_smb2_con_sopt()
via fe13b0c s4:torture/smb2: use smb2cli_tcon*() in
torture_smb2_tree_connect()
via 04d0110 s4:torture/smb2: use torture_smb2_tree_connect() in notify.c
via a8d1f26 s4:torture/smb2: torture_smb2_tree_connect() creates a
secondary tree connect
via c723d57 s4:libcli/smb2: make use of smb2cli_tcon*() in connect.c
via d11b0c4 s3:libsmb: remove unused smb2cli.h
via b77bb5a libcli/smb: move smb2cli_tcon.c to the toplevel
via 7ee18fb s3:smb2cli_tcon: use smb2 signing if possible
via 8c846f7 libcli/smb: add smb2cli_tcon_{should_sign,is_signing_on}()
via e954f92 libcli/smb: add smb2cli_tcon_should_encrypt()
via ca1081e libcli/smb: add smbXcli_session_is_authenticated()
via aa4310b libcli/smb: support additional_flags = SMB2_HDR_FLAG_SIGNED
via e9a5074 s3:libsmb: remove unused ';'
via 854f579 s4:libcli/smb_composite: don't try anonymous smb signing
via 760f23a s3:smb2_negprot: allow really large io sizes up to allmost
16MB
via 703ef59 tdb: Fix a comment
via 93e81d423 s3: lib: Signal handling - ensure smbrun and change
password code save and restore existing SIGCHLD handlers.
via fc8e105 lib: util [ctdb]: Signal handling - change CatchChild() and
CatchChildLeaveStatus() to return the previous handler.
via 16e460e s3: nmbd: Ensure the main nmbd process doesn't create
zombies.
via ba33426 s3:torture: transfer 1M message with fds in
LOCAL-MESSAGING-FDPASS2 test
via d4bf2be s3:torture: wait in tevent-loop for child to confirm
receive in FDPASS2 msg test
via 3628102 s3:torture: fix a message in LOCAL-MESSAGING-FDPASS2 test
via bc5c029 selftest: run LOCAL-MESSAGING-READ4
via f16dd64 s3:torture: add LOCAL-MESSAGING-READ4 - send 1MB message
via 797ada1 s3:messaging: explain why the messaging_send*() functions
need a tevent-loop.
via d7d9ec3 s3:unix_msg: document closing of fds in the receive handler
via 0ab5e89 s3:unix_msg: close the fds in unix_dgram_recv_handler()
after the callback has run
via 6e47886 s3:messaging: upon receiving fds, dup them so the caller
can safely close them.
via 00d9ee0 s3:messaging: allow the messaging receive callback to
change the fds
via d8af3e7 s3:unix_msg: don't fill cmsg buffer in unix_dgram_send_job()
via b38ed73 s3:unix_msg: add close_fd_array_cmsg()
via 20cd934 s3:unix_msg: factor extract_fd_array_from_msghdr() out of
unix_dgram_recv_handler()
via 67684dc s3:unix_msg: simplify queue_msg() by moving space
calculations up.
via a96f0f4 s3:unix_msg: use an iov in unix_dgram_msg/queue_msg instead
of buffer and length
via e38f4f4 s3:unix_msg: rename a variable buflen->data_len in
queue_msg()
via 2564a5f s3:unix_msg: use a buffer pointer instead of array indexes
for the iov buffer
via 9ddb661 s3:unix_msg: remember errno in unix_dgram_send_job in case
of send error.
via 9fa673b s3:unix_msg: don't close the fd-array at the end of
unix_dgram_send_job()
via 698e8a2 s3:unix_msg: add "close_fds" exit point to unix_msg_recv()
via 2795bdf s3:messaging: msg_type int->uint32_t in struct messaging_hdr
via 40b4853 s3:messaging: fix uninitialized data introduced by padding
via 1dbd0be tevent: version 0.9.22
via a65df7e tevent: remove unused exit_code in tevent_select.c
via 1ea3364 tevent: remove unused exit_code in tevent_poll.c
via 22eb416 repl: Specify the target realm in
dreplsrv_get_target_principal()
via 736098e WHATSNEW: Include info on secured winbindd connections
via afe02d1 winbindd: Change value of "ldap sasl wrapping" to sign
via e2cd325 winbindd: Do not make anonymous connections by default
via b9701a0 provision: Change the default functional level of new Samba
domains to 2008R2.
via bf0ee5f ldb: fix a typo in the comment, LDB_FLAGS_MOD_xxx ->
LDB_FLAG_MOD_xxx
via 9c92164 s3-winbindd: Do not use domain SID from LookupSids for
Sids2UnixIDs call
via 16594e7 s3: Move init_lsa_ref_domain_list to lib
via f3ce6b4 s3:net_rpc_p
Re: [SCM] Samba Shared Repository - branch master updated
On Wed, Feb 19, 2014 at 5:13 PM, Jeremy Allison wrote:
> On Wed, Feb 19, 2014 at 08:20:04PM +0100, Andreas Schneider wrote:
>> The branch, master has been updated
>
> Andreas and David,
>
>>via b8844fc clitar.c: check all allocations return value
>
> I *HATE* *HATE* *HATE* the idiom used here.
>
> Calling smb_panic on an allocation fail in the
> new tar code is manifestly the *WRONG* thing to
> do.
>
> +/* helper macro to die in case of NULL pointer */
> +#define PANIC_IF_NULL(x) \
> +_panic_if_null(x, __FILE__ ":" STR2(__LINE__) " (" #x ") == NULL\n")
> +
> +/* prototype to silent gcc warning */
> +static inline void* _panic_if_null(void *p, const char *expr);
> +static inline void* _panic_if_null(void *p, const char *expr)
> +{
> +if (!p) {
> +smb_panic(expr);
> +}
> +return p;
> +}
> +
>
> Then later..
>
> +TALLOC_CTX *ctx = PANIC_IF_NULL(talloc_new(NULL));
>
> and:
>
> +fname = PANIC_IF_NULL(talloc_asprintf(ctx,
> + "%s%s",
> + client_get_cur_dir(),
> + buf));
> if (!fname) {
> err = 1;
> goto out;
>
> The above even left the (correct) handling of
> the NULL return alone !
>
> Remember on common setups this will call a
> panic action script which will leave the
> client hanging on a sleep 999 call and
> leave the caller with a hung command and no
> indication of what failed.
>
> Can you fix this please to do proper error
> checking of a NULL return and to bail out
> of the tar command with a correct error indication
> that the command failed ?
>
> This really needs fixing properly before this code
> can go anywhere near a production branch.
Personally, I would like to lobby for an extra parameter to smb_panic,
called dump_core or something.
Here is a situation where we don't need to dump core:
source3/smbd/server.c#6 (text)
@@ -640,6 +640,18 @@
"because too many files are open\n"));
goto exit;
}
+
+ /*
+* If we get NT_STATUS_OPEN_FAILED, there was
a problem with
+* re-initing the TDBs, so complain, but do
not dump core
+* as this can exacerbate the problems.
+*/
+ if (NT_STATUS_EQUAL(status, NT_STATUS_OPEN_FAILED)) {
+ DEBUG(0, ("FATAL: child process cannot
initialize "
+ "because one or more TDBs
could not be reopened\n"));
+ goto exit;
+ }
+
if (lp_clustering() &&
NT_STATUS_EQUAL(status,
NT_STATUS_INTERNAL_DB_ERROR)) {
This happens after reinit_after_fork ...
When it happens because tdb_reopen_all failed, we should probably not
dump core, especially as that only exacerbates existing problems and
the core file tells us absolutely nothing new (the error in
tdb_reopen_all is long gone.)
--
Regards,
Richard Sharpe
(何以解憂？唯有杜康。--曹操)
[SCM] Samba Shared Repository - branch v4-2-stable updated
The branch, v4-2-stable has been updated
via 3011777 VERSION: Bump version up to 4.2.0rc1...
via 1ef2be6 vfs_fruit: deal with vfs_catia not being loaded
via b2626c2 vfs_fruit: remove redundant assignment
via 04ebed1 vfs_fruit: fix possible uninitialized use
via 26ff9f3 libcli/smb: call smb2cli_validate_negotiate_info*() after
each authenticated tcon
via 7729ba5 libcli/smb: add smb2cli_validate_negotiate_info*()
via 6a82cb7 libcli/smb: list NT_STATUS_FILE_CLOSED as expected ioctl
response.
via a51b623 s4:libcli/tcon: remove unused smb2_tree_connect*()
via 609b31a s4:torture/smb2: remove unused variable in
torture_smb2_con_sopt()
via fe13b0c s4:torture/smb2: use smb2cli_tcon*() in
torture_smb2_tree_connect()
via 04d0110 s4:torture/smb2: use torture_smb2_tree_connect() in notify.c
via a8d1f26 s4:torture/smb2: torture_smb2_tree_connect() creates a
secondary tree connect
via c723d57 s4:libcli/smb2: make use of smb2cli_tcon*() in connect.c
via d11b0c4 s3:libsmb: remove unused smb2cli.h
via b77bb5a libcli/smb: move smb2cli_tcon.c to the toplevel
via 7ee18fb s3:smb2cli_tcon: use smb2 signing if possible
via 8c846f7 libcli/smb: add smb2cli_tcon_{should_sign,is_signing_on}()
via e954f92 libcli/smb: add smb2cli_tcon_should_encrypt()
via ca1081e libcli/smb: add smbXcli_session_is_authenticated()
via aa4310b libcli/smb: support additional_flags = SMB2_HDR_FLAG_SIGNED
via e9a5074 s3:libsmb: remove unused ';'
via 854f579 s4:libcli/smb_composite: don't try anonymous smb signing
via 760f23a s3:smb2_negprot: allow really large io sizes up to allmost
16MB
via 703ef59 tdb: Fix a comment
via 93e81d423 s3: lib: Signal handling - ensure smbrun and change
password code save and restore existing SIGCHLD handlers.
via fc8e105 lib: util [ctdb]: Signal handling - change CatchChild() and
CatchChildLeaveStatus() to return the previous handler.
via 16e460e s3: nmbd: Ensure the main nmbd process doesn't create
zombies.
via ba33426 s3:torture: transfer 1M message with fds in
LOCAL-MESSAGING-FDPASS2 test
via d4bf2be s3:torture: wait in tevent-loop for child to confirm
receive in FDPASS2 msg test
via 3628102 s3:torture: fix a message in LOCAL-MESSAGING-FDPASS2 test
via bc5c029 selftest: run LOCAL-MESSAGING-READ4
via f16dd64 s3:torture: add LOCAL-MESSAGING-READ4 - send 1MB message
via 797ada1 s3:messaging: explain why the messaging_send*() functions
need a tevent-loop.
via d7d9ec3 s3:unix_msg: document closing of fds in the receive handler
via 0ab5e89 s3:unix_msg: close the fds in unix_dgram_recv_handler()
after the callback has run
via 6e47886 s3:messaging: upon receiving fds, dup them so the caller
can safely close them.
via 00d9ee0 s3:messaging: allow the messaging receive callback to
change the fds
via d8af3e7 s3:unix_msg: don't fill cmsg buffer in unix_dgram_send_job()
via b38ed73 s3:unix_msg: add close_fd_array_cmsg()
via 20cd934 s3:unix_msg: factor extract_fd_array_from_msghdr() out of
unix_dgram_recv_handler()
via 67684dc s3:unix_msg: simplify queue_msg() by moving space
calculations up.
via a96f0f4 s3:unix_msg: use an iov in unix_dgram_msg/queue_msg instead
of buffer and length
via e38f4f4 s3:unix_msg: rename a variable buflen->data_len in
queue_msg()
via 2564a5f s3:unix_msg: use a buffer pointer instead of array indexes
for the iov buffer
via 9ddb661 s3:unix_msg: remember errno in unix_dgram_send_job in case
of send error.
via 9fa673b s3:unix_msg: don't close the fd-array at the end of
unix_dgram_send_job()
via 698e8a2 s3:unix_msg: add "close_fds" exit point to unix_msg_recv()
via 2795bdf s3:messaging: msg_type int->uint32_t in struct messaging_hdr
via 40b4853 s3:messaging: fix uninitialized data introduced by padding
via 1dbd0be tevent: version 0.9.22
via a65df7e tevent: remove unused exit_code in tevent_select.c
via 1ea3364 tevent: remove unused exit_code in tevent_poll.c
via 22eb416 repl: Specify the target realm in
dreplsrv_get_target_principal()
via 736098e WHATSNEW: Include info on secured winbindd connections
via afe02d1 winbindd: Change value of "ldap sasl wrapping" to sign
via e2cd325 winbindd: Do not make anonymous connections by default
via b9701a0 provision: Change the default functional level of new Samba
domains to 2008R2.
via bf0ee5f ldb: fix a typo in the comment, LDB_FLAGS_MOD_xxx ->
LDB_FLAG_MOD_xxx
via 9c92164 s3-winbindd: Do not use domain SID from LookupSids for
Sids2UnixIDs call
via 16594e7 s3: Move init_lsa_ref_domain_list to lib
via f3ce6b4 s3:net_rpc_printer: make use of
cli_credentials_get_username()
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via e07ecd4 smbstatus: check for lock_path talloc failures via c5e2418 smbXsrv: don't leak lock_path onto talloc tos via ca18783 notify_internal: don't leak lock_path onto talloc tos via d3cd60d printer_list: don't leak lock_path onto talloc tos via 49fe698 nmbd_namelistdb: don't leak lock_path onto talloc tos via 8f9137c share_mode_lock: don't leak lock_path onto talloc tos via 39f8ff2 brlock: don't leak lock_path onto talloc tos via d6792ec serverid: don't leak lock_path onto talloc tos via 76fe51c server_mutex: don't leak lock_path onto talloc tos via d9d16cb g_lock: don't leak lock_path onto talloc tos via 176259f dbwrap_watch: don't leak lock_path onto talloc tos via 760af79 lang_tdb: don't leak lock_path or data_path onto talloc tos via 3553982 winbindd_cache: don't leak state_path onto talloc tos via d428aa6 winbindd: don't leak state_path onto talloc tos via 364d55c idmap_autorid: don't leak state_path onto talloc tos via 0210e3c smbcontrol: don't leak state_path onto talloc tos via c3f3b13 net_registry: don't leak state_path onto talloc tos via 7089683 net_idmap: don't leak state_path onto talloc tos via 587b216 reg_perfcount: don't leak state_path onto talloc tos via 4b6af0d reg_backend_db: don't leak state_path onto talloc tos via 2307c37 nt_printing: don't leak state_path onto talloc tos via 6d5b8dd pdb_tdb: don't leak state_path onto talloc tos via f88535e account_pol: don't leak state_path onto talloc tos via 30ab958 nmbd_winsserver: don't leak state_path onto talloc tos via f62d908 sharesec: don't leak state_path onto talloc tos via a852116 eventlog: don't leak state_path onto talloc tos via b75d7ac groupdb: don't leak state_path onto talloc tos via 745a1c5 Change expired password flag indicator from a3b333a s3:locking: remove dead code from brl_get_locks_readonly() https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e07ecd4fe698f685299258a666127430a3952058 Author: David Disseldorp Date: Sun Nov 2 20:21:49 2014 +0100 smbstatus: check for lock_path talloc failures Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Nov 4 02:07:35 CET 2014 on sn-devel-104 commit c5e241831c4d62ca9571fe3bec1434ecbf3e706c Author: David Disseldorp Date: Sun Nov 2 20:21:48 2014 +0100 smbXsrv: don't leak lock_path onto talloc tos Also check for allocation failures. Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison commit ca18783463d2f49a4249b0774196caafd4a08a22 Author: David Disseldorp Date: Sun Nov 2 20:21:47 2014 +0100 notify_internal: don't leak lock_path onto talloc tos Also check for allocation failures. Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison commit d3cd60d660a4a8ef03689c0b66ed730e444f84cc Author: David Disseldorp Date: Sun Nov 2 20:21:46 2014 +0100 printer_list: don't leak lock_path onto talloc tos Also check for allocation failures. Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison commit 49fe698fe9a794938725efd32b14c6bce95e1ef7 Author: David Disseldorp Date: Sun Nov 2 20:21:45 2014 +0100 nmbd_namelistdb: don't leak lock_path onto talloc tos Also check for allocation failures. Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison commit 8f9137cb5298a87bd989d29005a059f20dc2273f Author: David Disseldorp Date: Sun Nov 2 20:21:44 2014 +0100 share_mode_lock: don't leak lock_path onto talloc tos Also check for allocation failures. Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison commit 39f8ff2355f7b92ed364e80b842373978254b96d Author: David Disseldorp Date: Sun Nov 2 20:21:43 2014 +0100 brlock: don't leak lock_path onto talloc tos Also check for allocation failures. Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison commit d6792eca3c8cc4356d1e3a64161c8a0e5f8ff9d4 Author: David Disseldorp Date: Sun Nov 2 20:21:42 2014 +0100 serverid: don't leak lock_path onto talloc tos Also check for allocation failures. Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison commit 76fe51cea27ac29c5de237850795be7122ffdc12 Author: David Disseldorp Date: Sun Nov 2 20:21:41 2014 +0100 server_mutex: don't leak lock_path onto talloc tos Also check for allocation failures. Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison commit d9d16cb582caa34154fef1ad1ff84265fc4eaea4 Author: David Disseldorp Date: Sun Nov 2 20:21:40 2014 +0100 g_loc
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a6353fd Fix typo in docs-xml/manpages/net.8.xml from e07ecd4 smbstatus: check for lock_path talloc failures https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a6353fd301e2bcf9aaf1c7dc9d1642c49ae31f9f Author: Marc Muehlfeld Date: Tue Nov 4 01:54:47 2014 +0100 Fix typo in docs-xml/manpages/net.8.xml Typo: s/Createa/Create/ Signed-off-by: Marc Muehlfeld Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Tue Nov 4 04:29:23 CET 2014 on sn-devel-104 --- Summary of changes: docs-xml/manpages/net.8.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml index 9e982e3..feb92cc 100644 --- a/docs-xml/manpages/net.8.xml +++ b/docs-xml/manpages/net.8.xml @@ -357,7 +357,7 @@ --wipe - Createa a new database from scratch + Create a new database from scratch (used in "net registry check"). -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7467f6e s3: nmbd: Ensure NetBIOS names are only 15 characters
stored.
from a6353fd Fix typo in docs-xml/manpages/net.8.xml
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7467f6e72cba214eeca75c34e9d9fba354c7ef31
Author: Jeremy Allison
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.
Signed-off-by: Jeremy Allison
Reviewed-by: Andreas Schneider
Autobuild-User(master): Andreas Schneider
Autobuild-Date(master): Tue Nov 4 18:23:11 CET 2014 on sn-devel-104
---
Summary of changes:
source3/lib/util_names.c | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/util_names.c b/source3/lib/util_names.c
index cf54a0e..1392b48 100644
--- a/source3/lib/util_names.c
+++ b/source3/lib/util_names.c
@@ -60,7 +60,15 @@ static bool set_my_netbios_names(const char *name, int i)
{
SAFE_FREE(smb_my_netbios_names[i]);
- smb_my_netbios_names[i] = SMB_STRDUP(name);
+ /*
+* Don't include space for terminating '\0' in strndup,
+* it is automatically added. 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.
+*/
+ smb_my_netbios_names[i] = SMB_STRNDUP(name, MAX_NETBIOSNAME_LEN-1);
if (!smb_my_netbios_names[i])
return False;
return strupper_m(smb_my_netbios_names[i]);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6faef4d btrfs: don't leak opened directory handle
from 7467f6e s3: nmbd: Ensure NetBIOS names are only 15 characters
stored.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6faef4d213e76077bdbaf83cf07f0261c11dc757
Author: Noel Power
Date: Tue Nov 4 16:52:49 2014 +0100
btrfs: don't leak opened directory handle
Closing a directory handle file descriptor via close() is undefined,
according to:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/dirfd.html
Signed-off-by: Noel Power
Reviewed-by: David Disseldorp
Reviewed-by: Jeremy Allison
Autobuild-User(master): David Disseldorp
Autobuild-Date(master): Tue Nov 4 20:51:02 CET 2014 on sn-devel-104
---
Summary of changes:
source3/modules/vfs_btrfs.c | 22 --
1 file changed, 16 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_btrfs.c b/source3/modules/vfs_btrfs.c
index c1e17b3..5144239 100644
--- a/source3/modules/vfs_btrfs.c
+++ b/source3/modules/vfs_btrfs.c
@@ -245,23 +245,29 @@ static NTSTATUS btrfs_get_compression(struct
vfs_handle_struct *handle,
int fd;
bool opened = false;
NTSTATUS status;
+ DIR *dir = NULL;
if ((fsp != NULL) && (fsp->fh->fd != -1)) {
fd = fsp->fh->fd;
} else if (smb_fname != NULL) {
if (S_ISDIR(smb_fname->st.st_ex_mode)) {
- DIR *dir = opendir(smb_fname->base_name);
+ dir = opendir(smb_fname->base_name);
if (dir == NULL) {
return NT_STATUS_UNSUCCESSFUL;
}
+ opened = true;
fd = dirfd(dir);
+ if (fd < 0) {
+ status = NT_STATUS_UNSUCCESSFUL;
+ goto err_close;
+ }
} else {
fd = open(smb_fname->base_name, O_RDONLY);
+ if (fd < 0) {
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+ opened = true;
}
- if (fd < 0) {
- return NT_STATUS_UNSUCCESSFUL;
- }
- opened = true;
} else {
return NT_STATUS_INVALID_PARAMETER;
}
@@ -281,7 +287,11 @@ static NTSTATUS btrfs_get_compression(struct
vfs_handle_struct *handle,
status = NT_STATUS_OK;
err_close:
if (opened) {
- close(fd);
+ if (dir != NULL) {
+ closedir(dir);
+ } else {
+ close(fd);
+ }
}
return status;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-2-test updated
The branch, v4-2-test has been updated
via e7a90aa s3:locking: remove dead code from brl_get_locks_readonly()
via 38b8e09 s3:locking: Change from ndr_pull_struct_blob() to
ndr_pull_struct_blob_all() so we fail if not all bytes are consumed.
via 1fd4868 s4:torture/smb2: test rename dir deny with open files
via b5cc961 s3:smbd: Don't rename a dir with files open underneath
via beb05a1b selftest:Samba3: use "strict rename = yes"
via 4ff4c58 s3:param: Add new option "strict rename".
via b527525 s3:locking: allow early return for share_entry_forall()
via cfa74dc s3:locking: Introduce share_mode_forall
via ac37fae s3:locking: Rename share_mode_forall->share_entry_forall
via e430584 s3: smbd: Preparation for leases code merge. Ensure VFS is
ready for 4.2.0.
via fd4cc75 samba-tool group add: Add option --nis-domain and --gid
from 703957e s3: libsmbclient - smb2. MacOSX 10 SMB2 server doesn't set
STATUS_NO_MORE_FILES when handed a non-wildcard path.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test
- Log -
commit e7a90aaa200d95afe0d6e90a1149d0c9f09aed8f
Author: Stefan Metzmacher
Date: Wed Oct 29 17:29:06 2014 +0100
s3:locking: remove dead code from brl_get_locks_readonly()
struct byte_range_lock *rw = NULL; will never change...
commit 105724073300af03eb0835b3c93d9b2e2bfacb07 removed the
possible assigment of 'rw'.
So we can remove all code under if (rw != NULL) { ...
Signed-off-by: Stefan Metzmacher
Reviewed-by: Michael Adam
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Fri Oct 31 06:07:43 CET 2014 on sn-devel-104
(cherry picked from commit a3b333a1a2ab23ba0c59be1fc65c730e2b53e8c5)
The last 10 patches address bug #10911 - SMB2 leases are not yet supported.
Autobuild-User(v4-2-test): Karolin Seeger
Autobuild-Date(v4-2-test): Tue Nov 4 23:38:34 CET 2014 on sn-devel-104
commit 38b8e0975c0ad51af722556e27d7c5f7402daf94
Author: Volker Lendecke
Date: Tue Oct 28 15:20:26 2014 -0700
s3:locking: Change from ndr_pull_struct_blob() to
ndr_pull_struct_blob_all() so we fail if not all bytes are consumed.
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
Reviewed-by: Stefan Metzmacher
(cherry picked from commit 151b9caeef7dc4fa4816035a406acb9f1c5812c3)
commit 1fd48687fe5bf5fd3dcd918422a4fe4fc34d38b9
Author: Volker Lendecke
Date: Thu Sep 25 01:32:00 2014 +0200
s4:torture/smb2: test rename dir deny with open files
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
Reviewed-by: Stefan Metzmacher
(cherry picked from commit 8334428666b8282d2cfbcfd411acab0c338ae390)
commit b5cc9614fc6d5296fb5b3482a56888a3aa03461b
Author: Volker Lendecke
Date: Thu Sep 25 01:30:33 2014 +0200
s3:smbd: Don't rename a dir with files open underneath
This is an EXPENSIVE check. We'll have to guard this with an option
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
Reviewed-by: Stefan Metzmacher
(cherry picked from commit 035fd7200d8a025cdb8bfae30c264757aa3cb193)
commit beb05a1b891fd51463def0b6f3b43394e4451414
Author: Jeremy Allison
Date: Fri Oct 24 13:57:04 2014 -0700
selftest:Samba3: use "strict rename = yes"
Signed-off-by: Jeremy Allison
Reviewed-by: Stefan Metzmacher
(cherry picked from commit 5f60dcc38ca275aedeb1d67611b5acf9b26361d5)
commit 4ff4c58ee75887b8e5e4ea3752eb0d82e13e903a
Author: Jeremy Allison
Date: Fri Oct 24 13:57:04 2014 -0700
s3:param: Add new option "strict rename".
Control whether smbd can rename directories containing
open files. Defaults to "no" (meaning we *can* do
such renames).
Signed-off-by: Jeremy Allison
Reviewed-by: Stefan Metzmacher
(cherry picked from commit b0a434386dc2f77df89811bc3f56c4cc7fb7b16c)
commit b5275259290ae468c9047ef5a1e27b7f113c9718
Author: Volker Lendecke
Date: Wed Sep 24 20:46:15 2014 +0200
s3:locking: allow early return for share_entry_forall()
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
Reviewed-by: Stefan Metzmacher
(cherry picked from commit 9010bbeb00264f4476c3be7d2e8c8420c695cfbb)
commit cfa74dcf2617b2c03de1458e35cbb0533d2bfffb
Author: Volker Lendecke
Date: Tue Sep 23 05:45:49 2014 +0200
s3:locking: Introduce share_mode_forall
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
Reviewed-by: Stefan Metzmacher
(cherry picked from commit 48926b761975a7d9cb6daf30d64d6a4f0a34f38a)
commit ac37fae12b5023a2680df73fe230825be069b515
Author: Volker Lendecke
Date: Tue Sep 23 05:18:54 2014 +0200
s3:locking: Rename share_mode_forall->share_entry_forall
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
Revie
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 10e888f smbcontrol: Use server_id_str_buf
from 6faef4d btrfs: don't leak opened directory handle
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 10e888f6cee8cdc4c905d3c2788a47901bd42b2c
Author: Volker Lendecke
Date: Tue Nov 4 13:59:25 2014 +0100
smbcontrol: Use server_id_str_buf
Signed-off-by: Volker Lendecke
Reviewed-by: Martin Schwenke
Autobuild-User(master): Martin Schwenke
Autobuild-Date(master): Wed Nov 5 13:03:39 CET 2014 on sn-devel-104
---
Summary of changes:
source3/utils/smbcontrol.c | 19 ---
1 file changed, 8 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 164c48a..9af0f3e 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -121,12 +121,10 @@ static void print_pid_string_cb(struct messaging_context
*msg,
struct server_id pid,
DATA_BLOB *data)
{
- char *pidstr;
+ struct server_id_buf pidstr;
- pidstr = server_id_str(talloc_tos(), &pid);
- printf("PID %s: %.*s", pidstr, (int)data->length,
- (const char *)data->data);
- TALLOC_FREE(pidstr);
+ printf("PID %s: %.*s", server_id_str_buf(pid, &pidstr),
+ (int)data->length, (const char *)data->data);
num_replies++;
}
@@ -442,9 +440,8 @@ static void pong_cb(struct messaging_context *msg,
struct server_id pid,
DATA_BLOB *data)
{
- char *src_string = server_id_str(NULL, &pid);
- printf("PONG from pid %s\n", src_string);
- TALLOC_FREE(src_string);
+ struct server_id_buf src_string;
+ printf("PONG from pid %s\n", server_id_str_buf(pid, &src_string));
num_replies++;
}
@@ -1235,10 +1232,10 @@ static void winbind_validate_cache_cb(struct
messaging_context *msg,
struct server_id pid,
DATA_BLOB *data)
{
- char *src_string = server_id_str(NULL, &pid);
+ struct server_id_buf src_string;
printf("Winbindd cache is %svalid. (answer from pid %s)\n",
- (*(data->data) == 0 ? "" : "NOT "), src_string);
- TALLOC_FREE(src_string);
+ (*(data->data) == 0 ? "" : "NOT "),
+ server_id_str_buf(pid, &src_string));
num_replies++;
}
--
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-05-1957/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-11-05-1957/samba.stderr http://git.samba.org/autobuild.flakey/2014-11-05-1957/samba.stdout The top commit at the time of the failure was: commit 10e888f6cee8cdc4c905d3c2788a47901bd42b2c Author: Volker Lendecke Date: Tue Nov 4 13:59:25 2014 +0100 smbcontrol: Use server_id_str_buf Signed-off-by: Volker Lendecke Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Wed Nov 5 13:03:39 CET 2014 on sn-devel-104
