[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  8de1ed6 s4: fix linking smbtorture on Solaris.
      from  5d7eaf9 vfs_fruit: return value of ad_pack in vfs_fruit.c

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8de1ed6d6e660760483a17f34842979384a655f9
Author: Tom Schulz <schulz at adi.com>
Date:   Mon Oct 5 22:19:49 2015 +0200

    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 at adi.com>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Tue Oct  6 19:15:22 CEST 2015 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/torture/local/nss_tests.c | 4 ++++
 1 file changed, 4 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c
index e814dba..2cd6122 100644
--- a/source4/torture/local/nss_tests.c
+++ b/source4/torture/local/nss_tests.c
@@ -698,6 +698,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,
@@ -732,6 +733,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,
@@ -759,12 +761,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),


-- 
Samba Shared Repository