Attachment 13037 Details for Bug 12627 – patch

[patch] patch

nss_tests.c.patch (text/plain), 2.69 KB, created by Ruga on 2017-03-11 15:16:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ruga

Created: 2017-03-11 15:16:03 UTC

Size: 2.69 KB

patch

obsolete

>--- source4/torture/local/nss_tests.c.orig	2017-03-11 15:29:52.000000000 +0100
>+++ source4/torture/local/nss_tests.c	2017-03-11 15:29:46.000000000 +0100
>@@ -297,6 +297,7 @@
> 	return true;
> }
> 
>+#ifdef HAVE_GETPWENT_R
> static bool test_enum_passwd(struct torture_context *tctx,
> 			     struct passwd **pwd_array_p,
> 			     size_t *num_pwd_p)
>@@ -381,7 +382,9 @@
> 
> 	return true;
> }
>+#endif /* HAVE_GETPWENT_R */
> 
>+#ifdef HAVE_GETPWENT_R
> static bool torture_assert_passwd_equal(struct torture_context *tctx,
> 					const struct passwd *p1,
> 					const struct passwd *p2,
>@@ -494,7 +497,9 @@
> 
> 	return true;
> }
>+#endif /* HAVE_GETPWENT_R */
> 
>+#ifdef HAVE_GETGRENT_R
> static bool test_enum_group(struct torture_context *tctx,
> 			    struct group **grp_array_p,
> 			    size_t *num_grp_p)
>@@ -579,7 +584,9 @@
> 
> 	return true;
> }
>+#endif /* HAVE_GETGRENT_R */
> 
>+#ifdef HAVE_GETGRENT_R
> static bool torture_assert_group_equal(struct torture_context *tctx,
> 				       const struct group *g1,
> 				       const struct group *g2,
>@@ -600,7 +607,9 @@
> 
> 	return true;
> }
>+#endif /* HAVE_GETGRENT_R */
> 
>+#ifdef HAVE_GETGRENT_R
> static bool test_group(struct torture_context *tctx)
> {
> 	int i;
>@@ -697,6 +706,7 @@
> 
> 	return true;
> }
>+#endif /* HAVE_GETGRENT_R */
> 
> #ifdef HAVE_GETGROUPLIST
> static bool test_getgrouplist(struct torture_context *tctx,
>@@ -809,6 +819,7 @@
> 	return true;
> }
> 
>+#ifdef HAVE_GETGRENT_R
> static bool test_membership(struct torture_context *tctx)
> {
> 	const char *old_pwd = getenv("NSS_WRAPPER_PASSWD");
>@@ -896,7 +907,9 @@
> 
> 	return true;
> }
>+#endif /* HAVE_GETGRENT_R */
> 
>+#ifdef HAVE_GETPWENT_R
> static bool test_passwd_duplicates(struct torture_context *tctx)
> {
> 	int i, d;
>@@ -931,7 +944,9 @@
> 
> 	return true;
> }
>+#endif /* HAVE_GETPWENT_R */
> 
>+#ifdef HAVE_GETGRENT_R
> static bool test_group_duplicates(struct torture_context *tctx)
> {
> 	int i, d;
>@@ -967,7 +982,6 @@
> 	return true;
> }
> 
>-
> static bool test_duplicates(struct torture_context *tctx)
> {
> 	const char *old_pwd = getenv("NSS_WRAPPER_PASSWD");
>@@ -985,17 +999,22 @@
> 
> 	return true;
> }
>-
>+#endif /* HAVE_GETGRENT_R */
> 
> struct torture_suite *torture_local_nss(TALLOC_CTX *mem_ctx)
> {
> 	struct torture_suite *suite = torture_suite_create(mem_ctx, "nss");
> 
>+#ifdef HAVE_GETGRENT_R
> 	torture_suite_add_simple_test(suite, "enumeration", test_enumeration);
> 	torture_suite_add_simple_test(suite, "reentrant enumeration", test_reentrant_enumeration);
> 	torture_suite_add_simple_test(suite, "reentrant enumeration crosschecks", test_reentrant_enumeration_crosschecks);
> 	torture_suite_add_simple_test(suite, "membership", test_membership);
> 	torture_suite_add_simple_test(suite, "duplicates", test_duplicates);
>+#endif /* HAVE_GETGRENT_R */
> 
> 	return suite;
> }
>+
>+
>+

Actions: View

Attachments on bug 12627: 13037