Attachment 11478 Details for Bug 11508 – patch for 4.3 cherry-picked from master

[patch] patch for 4.3 cherry-picked from master

11508-v4-3-test.patch (text/plain), 1.88 KB, created by Michael Adam on 2015-10-05 19:56:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2015-10-05 19:56:11 UTC

Size: 1.88 KB

patch

obsolete

>From 1622dfad720069c2e6c6f02bc4dc81c7d16a7fbf Mon Sep 17 00:00:00 2001
>From: Tom Schulz <schulz@adi.com>
>Date: Wed, 16 Sep 2015 16:55:23 -0700
>Subject: [PATCH] s4: tests: Fix nss_tests build on Solaris.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Too many arguments for Solaris getpwent_r() and getgrent_r().
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11508
>
>Signed-off-by: Tom Schulz <schulz@adi.com>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Ralph BÃ¶hme <rb@sernet.de>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Thu Sep 17 05:01:07 CEST 2015 on sn-devel-104
>
>(cherry picked from commit 5866fcc1645366a56e68fc3d8065618131364337)
>---
> source4/torture/local/nss_tests.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c
>index 546d7eb..e814dba 100644
>--- a/source4/torture/local/nss_tests.c
>+++ b/source4/torture/local/nss_tests.c
>@@ -349,7 +349,11 @@ static bool test_enum_r_passwd(struct torture_context *tctx,
> 	while (1) {
> 		torture_comment(tctx, "Testing getpwent_r\n");
> 
>+#ifdef SOLARIS_GETPWENT_R
>+		ret = getpwent_r(&pwd, buffer, sizeof(buffer));
>+#else /* SOLARIS_GETPWENT_R */
> 		ret = getpwent_r(&pwd, buffer, sizeof(buffer), &pwdp);
>+#endif /* SOLARIS_GETPWENT_R */
> 		if (ret != 0) {
> 			if (ret != ENOENT) {
> 				torture_comment(tctx, "got %d return code\n", ret);
>@@ -543,7 +547,11 @@ static bool test_enum_r_group(struct torture_context *tctx,
> 	while (1) {
> 		torture_comment(tctx, "Testing getgrent_r\n");
> 
>+#ifdef SOLARIS_GETGRENT_R
>+		ret = getgrent_r(&grp, buffer, sizeof(buffer));
>+#else /* SOLARIS_GETGRENT_R */
> 		ret = getgrent_r(&grp, buffer, sizeof(buffer), &grpp);
>+#endif /* SOLARIS_GETGRENT_R */
> 		if (ret != 0) {
> 			if (ret != ENOENT) {
> 				torture_comment(tctx, "got %d return code\n", ret);
>-- 
>2.4.3
>

Flags:

obnox: review+
jra: review+
obnox: review? (slow)

Actions: View

Attachments on bug 11508: 11441 | 11478