Attachment 11501 Details for Bug 11512 – Patch for 4.3 cherry-picked from master

[patch] Patch for 4.3 cherry-picked from master

bug11512.patch (text/plain), 1.85 KB, created by Ralph Böhme on 2015-10-16 15:53:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2015-10-16 15:53:32 UTC

Size: 1.85 KB

patch

obsolete

>From 26fd47d5d48282bbde828b2aac7a3181688e51f4 Mon Sep 17 00:00:00 2001
>From: Tom Schulz <schulz@adi.com>
>Date: Mon, 5 Oct 2015 22:19:49 +0200
>Subject: [PATCH] s4: fix linking smbtorture on Solaris.
>
>Don't test getgrouplist if we do not have it.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11512
>
>Signed-off-by: Tom Schulz <schulz@adi.com>
>Reviewed-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>
>Autobuild-User(master): Michael Adam <obnox@samba.org>
>Autobuild-Date(master): Tue Oct  6 19:15:22 CEST 2015 on sn-devel-104
>
>(cherry picked from commit 8de1ed6d6e660760483a17f34842979384a655f9)
>---
> source4/torture/local/nss_tests.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c
>index 546d7eb..878a24e 100644
>--- a/source4/torture/local/nss_tests.c
>+++ b/source4/torture/local/nss_tests.c
>@@ -690,6 +690,7 @@ static bool test_group_r_cross(struct torture_context *tctx)
> 	return true;
> }
> 
>+#ifdef HAVE_GETGROUPLIST
> static bool test_getgrouplist(struct torture_context *tctx,
> 			      const char *user,
> 			      gid_t gid,
>@@ -724,6 +725,7 @@ static bool test_getgrouplist(struct torture_context *tctx,
> 
> 	return true;
> }
>+#endif /* HAVE_GETGROUPLIST */
> 
> static bool test_user_in_group(struct torture_context *tctx,
> 			       const struct passwd *pwd,
>@@ -751,12 +753,14 @@ static bool test_membership_user(struct torture_context *tctx,
> 	int g, i;
> 	bool primary_group_had_user_member = false;
> 
>+#ifdef HAVE_GETGROUPLIST
> 	torture_assert(tctx, test_getgrouplist(tctx,
> 					       pwd->pw_name,
> 					       pwd->pw_gid,
> 					       &user_groups,
> 					       &num_user_groups),
> 					       "failed to test getgrouplist");
>+#endif /* HAVE_GETGROUPLIST */
> 
> 	for (g=0; g < num_user_groups; g++) {
> 		torture_assert(tctx, test_getgrgid(tctx, user_groups[g], NULL),
>-- 
>2.1.0
>

Flags:

obnox: review+
jra: review+

Actions: View

Attachments on bug 11512: 11442 | 11479 | 11501