Attachment 11490 Details for Bug 11555 – git-am fix for master.

[patch] git-am fix for master.

bug-11555 (text/plain), 2.42 KB, created by Jeremy Allison on 2015-10-14 18:32:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2015-10-14 18:32:09 UTC

Size: 2.42 KB

patch

obsolete

>From 37dbefd854d3e63eeae903754d71748e948d8f12 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 14 Oct 2015 11:06:53 -0700
>Subject: [PATCH 1/2] s3: lsa: lookup_names() logic for unqualified (no DOMAIN\
> component) names is incorrect.
>
>Change so we only use unqualified name lookup logic if
>domain component = "" and LOOKUP_NAME_ISOLATED flag is
>passed in.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11555
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/passdb/lookup_sid.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
>index 3f99ee1..6096084 100644
>--- a/source3/passdb/lookup_sid.c
>+++ b/source3/passdb/lookup_sid.c
>@@ -140,7 +140,7 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
> 		return false;
> 	}
> 
>-	if ((domain[0] == '\0') && (!(flags & LOOKUP_NAME_ISOLATED))) {
>+	if ((domain[0] != '\0') || (!(flags & LOOKUP_NAME_ISOLATED))) {
> 		TALLOC_FREE(tmp_ctx);
> 		return false;
> 	}
>-- 
>2.6.0.rc2.230.g3dd15c0
>
>
>From cdfc271ea590a59b86a3ecd8fb63b30d0e88248b Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 14 Oct 2015 11:20:08 -0700
>Subject: [PATCH 2/2] s3: test: Fix standalone valid users fileserver test.
>
>Test was originally added for bug #11320. At the time
>I remarked the only way I could get this to reproduce
>the issue was to use "+WORKGROUP\userdup" instead of
>just "+userdup" (which was the actual problem reported),
>but I didn't investigage enough to discover the underlying
>problem which is actually bug:
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11555
>
>(lookup_names() logic for unqualified (no DOMAIN\
>component) names is incorrect). On a standalone
>fileserver "WORKGROUP\name" should not resolve,
>but "NETBIOS-NAME\name" and just "name" should.
>
>This corrects the test now that lookups for unqualified
>names are now being done correctly.
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> selftest/target/Samba3.pm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
>index de4346e..15423fe 100755
>--- a/selftest/target/Samba3.pm
>+++ b/selftest/target/Samba3.pm
>@@ -608,7 +608,7 @@ sub setup_fileserver($$)
> 	dfree command = $srcdir_abs/testprogs/blackbox/dfree.sh
> [valid-users-access]
> 	path = $valid_users_sharedir
>-	valid users = +SAMBA-TEST/userdup
>+	valid users = +userdup
> 	";
> 
> 	my $vars = $self->provision($path,
>-- 
>2.6.0.rc2.230.g3dd15c0
>

Actions: View

Attachments on bug 11555: 11490 | 11493 | 11497 | 11498