Attachment 16358 Details for Bug 13124 – additional patch for 4.12 and 4.11

[patch] additional patch for 4.12 and 4.11

v4-12.patch (text/plain), 1.18 KB, created by Andreas Schneider on 2020-12-04 09:21:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2020-12-04 09:21:00 UTC

Size: 1.18 KB

patch

obsolete

>From c8fba2225ff5ca7506264dc8e61988f29082b84e Mon Sep 17 00:00:00 2001
>From: Isaac Boukris <iboukris@gmail.com>
>Date: Tue, 14 Jul 2020 22:38:06 +0200
>Subject: [PATCH] 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 <iboukris@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Thu Jul 16 10:41:40 UTC 2020 on sn-devel-184
>
>(cherry picked from commit d67e9149a612044e247e7a4d78913ecf396c69fc)
>---
> source3/libads/ldap.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
>index 36e73440495..0a7d6eebec3 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;
> 		}
> 
>-- 
>2.29.2
>

Flags:

asn: review? (ab)
iboukris: review-

Actions: View

Attachments on bug 13124: 16030 | 16031 | 16032 | 16033 | 16357 | 16358