The branch, master has been updated via d67e9149a61 s3-libads: Pass timeout to open_socket_out in ms from 8ea51f4135d s3: libsmb: Cleanup - Make ipstr_list_make() talloc rather than malloc.
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d67e9149a612044e247e7a4d78913ecf396c69fc Author: Isaac Boukris <ibouk...@gmail.com> Date: Tue Jul 14 22:38:06 2020 +0200 s3-libads: Pass timeout to open_socket_out in ms BUG: https://bugzilla.samba.org/show_bug.cgi?id=13124 Signed-off-by: Isaac Boukris <ibouk...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Thu Jul 16 10:41:40 UTC 2020 on sn-devel-184 ----------------------------------------------------------------------- Summary of changes: source3/libads/ldap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 1ffe96d32c9..d431156912f 100755 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -96,9 +96,11 @@ static void gotalarm_sig(int signum) { int fd = -1; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; + unsigned timeout_ms = 1000 * to; - status = open_socket_out(ss, port, to, &fd); + status = open_socket_out(ss, port, timeout_ms, &fd); if (!NT_STATUS_IS_OK(status)) { + DEBUG(3, ("open_socket_out: failed to open socket\n")); return NULL; } -- Samba Shared Repository