1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00

s4: tests: Fix nss_tests build on Solaris.

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)
This commit is contained in:
Tom Schulz 2015-09-16 16:55:23 -07:00 committed by Karolin Seeger
parent e765cf9702
commit f1ed825175

View File

@ -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);