Attachment 9704 Details for Bug 10458 – Draft v4-0-test patches

[patch] Draft v4-0-test patches

tmp40.diff (text/plain), 4.07 KB, created by Stefan Metzmacher on 2014-02-20 17:13:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2014-02-20 17:13:06 UTC

Size: 4.07 KB

patch

obsolete

>From aa2d2c4de2b999ae47c538e12211ae212894b9ad Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 26 Sep 2013 01:20:10 +0200
>Subject: [PATCH 1/3] pidl:NDR/Client: fix dcerpc_function() with [out,ref]
> pointers
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>(cherry picked from commit f50b561336c7b6c08300e6e477859d1f9fab62c2)
>---
> pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm |   14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
>diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
>index c796b46..fed94cd 100644
>--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
>+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
>@@ -693,6 +693,20 @@ sub ParseFunction_Sync($$$$)
> 	}
> 	$self->pidl("");
> 
>+	$self->pidl("/* Out parameters */");
>+	foreach my $e (@{$fn->{ELEMENTS}}) {
>+		next unless grep(/out/, @{$e->{DIRECTION}});
>+
>+		$self->ParseCopyArgument($fn, $e, "r.out.", "_");
>+	}
>+	$self->pidl("");
>+
>+	if (defined($fn->{RETURN_TYPE})) {
>+		$self->pidl("/* Result */");
>+		$self->pidl("ZERO_STRUCT(r.out.result);");
>+		$self->pidl("");
>+	}
>+
> 	$self->pidl("status = dcerpc_$name\_r(h, mem_ctx, &r);");
> 	$self->pidl("if (!NT_STATUS_IS_OK(status)) {");
> 	$self->indent;
>-- 
>1.7.9.5
>
>
>From 952415fab36bd0789b62a42bc1ebf362e67b70c1 Mon Sep 17 00:00:00 2001
>From: Gregor Beck <gbeck@sernet.de>
>Date: Thu, 20 Feb 2014 13:14:31 +0100
>Subject: [PATCH 2/3] s3:winbindd: fix _wbint_LookupSids() on error
>
>We need to make sure that r->out.domains remains valid,
>otherwise we're not able to marshall the response.
>
>Note that wbint_LookupSids() has [out,ref] lsa_RefDomainList *domains,
>while lsa_LookupSids() has [out,ref] lsa_RefDomainList **domains.
>
>Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=10458
>Signed-off-by: Gregor Beck <gbeck@sernet.de>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>---
> source3/winbindd/winbindd_dual_srv.c |    8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
>index 5344063..4227d6a 100644
>--- a/source3/winbindd/winbindd_dual_srv.c
>+++ b/source3/winbindd/winbindd_dual_srv.c
>@@ -74,6 +74,7 @@ NTSTATUS _wbint_LookupSid(struct pipes_struct *p, struct wbint_LookupSid *r)
> NTSTATUS _wbint_LookupSids(struct pipes_struct *p, struct wbint_LookupSids *r)
> {
> 	struct winbindd_domain *domain = wb_child_domain();
>+	struct lsa_RefDomainList *domains = r->out.domains;
> 	NTSTATUS status;
> 
> 	if (domain == NULL) {
>@@ -87,7 +88,12 @@ NTSTATUS _wbint_LookupSids(struct pipes_struct *p, struct wbint_LookupSids *r)
> 	 * done at the wbint RPC layer.
> 	 */
> 	status = rpc_lookup_sids(p->mem_ctx, domain, r->in.sids,
>-				 &r->out.domains, &r->out.names);
>+				 &domains, &r->out.names);
>+
>+	if (domains != NULL) {
>+		r->out.domains = domains;
>+	}
>+
> 	reset_cm_connection_on_error(domain, status);
> 	return status;
> }
>-- 
>1.7.9.5
>
>
>From 1c484cfd4ac553d57035da8f72e7009c5d2f6dbc Mon Sep 17 00:00:00 2001
>From: Gregor Beck <gbeck@sernet.de>
>Date: Thu, 20 Feb 2014 11:25:53 +0100
>Subject: [PATCH 3/3] s3:winbindd: avoid directly asking a trusted domain in
> wb_lookupsids*()
>
>As a domain member we should always use a DC of our own domain.
>
>It would be possible to pass all sids in one single dcerpc_wbint_LookupSids()
>call. For now we just fix bug.
>
>Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=10458
>Signed-off-by: Gregor Beck <gbeck@sernet.de>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>---
> source3/winbindd/wb_lookupsids.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/winbindd/wb_lookupsids.c b/source3/winbindd/wb_lookupsids.c
>index e10d511..b474220 100644
>--- a/source3/winbindd/wb_lookupsids.c
>+++ b/source3/winbindd/wb_lookupsids.c
>@@ -320,7 +320,7 @@ static struct wb_lookupsids_domain *wb_lookupsids_get_domain(
> 		}
> 	}
> 
>-	wb_domain = find_domain_from_sid_noinit(sid);
>+	wb_domain = find_lookup_domain_from_sid(sid);
> 	if (wb_domain == NULL) {
> 		return NULL;
> 	}
>-- 
>1.7.9.5
>

Actions: View

Attachments on bug 10458: 9701 | 9702 | 9703 | 9704 | 9709 | 9710