Attachment 12358 Details for Bug 12135 – git-am fix for 4.5.0, 4.4.next, 4.3.next

[patch] git-am fix for 4.5.0, 4.4.next, 4.3.next

look (text/plain), 2.27 KB, created by Jeremy Allison on 2016-08-10 17:45:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2016-08-10 17:45:20 UTC

Size: 2.27 KB

patch

obsolete

>From 4362e53c470a12752a71ef5193b592f3e065a052 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Mon, 8 Aug 2016 16:53:21 -0700
>Subject: [PATCH 1/2] s3: libsmb: Protect cli_connect_nb_send() from being
> passed a NULL hostname and dest_ss.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12135
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Uri Simchoni <uri@samba.org>
>(cherry picked from commit 27ebf64b347a770e0d1ad4f1db645cb1b8dd5861)
>---
> source3/libsmb/cliconnect.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
>index ebba8f2..33759d9 100644
>--- a/source3/libsmb/cliconnect.c
>+++ b/source3/libsmb/cliconnect.c
>@@ -3108,11 +3108,15 @@ static struct tevent_req *cli_connect_nb_send(
> 		}
> 
> 		state->desthost = host;
>-	} else {
>+	} else if (dest_ss != NULL) {
> 		state->desthost = print_canonical_sockaddr(state, dest_ss);
> 		if (tevent_req_nomem(state->desthost, req)) {
> 			return tevent_req_post(req, ev);
> 		}
>+	} else {
>+		/* No host or dest_ss given. Error out. */
>+		tevent_req_error(req, EINVAL);
>+		return tevent_req_post(req, ev);
> 	}
> 
> 	subreq = cli_connect_sock_send(state, ev, host, name_type, dest_ss,
>-- 
>2.8.0.rc3.226.g39d4020
>
>
>From 31806c5698aa51678c5576822181839f5f2b5a8f Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 9 Aug 2016 11:57:20 -0700
>Subject: [PATCH 2/2] libgpo: Correctly use the 'server' parameter after
> parsing it out of the GPO path.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12135
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Uri Simchoni <uri@samba.org>
>(cherry picked from commit 2a8ccc0841184c2df9fc19f8452009b92071c115)
>---
> libgpo/gpo_fetch.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
>index 97ecd62..836bc23 100644
>--- a/libgpo/gpo_fetch.c
>+++ b/libgpo/gpo_fetch.c
>@@ -166,7 +166,7 @@ NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
> 
> 	/* for now reuse the existing ds connection */
> 
>-	result = gpo_connect_server(ads, ads->server.ldap_server, service, &cli);
>+	result = gpo_connect_server(ads, server, service, &cli);
> 	NT_STATUS_NOT_OK_RETURN(result);
> 
> 	result = gpo_prepare_local_store(mem_ctx, cache_dir, unix_path);
>-- 
>2.8.0.rc3.226.g39d4020
>

Flags:

uri: review+

Actions: View

Attachments on bug 12135: 12358