1 --- samba-4.6.6.orig/source4/torture/local/nss_tests.c 2017-01-09 09:12:33.000000000 +0100
2 +++ samba-4.6.6/source4/torture/local/nss_tests.c 2017-08-03 07:58:11.514847082 +0200
3 @@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct tortu
8 static bool test_getgrgid(struct torture_context *tctx,
11 @@ -333,6 +332,7 @@ static bool test_enum_passwd(struct tort
16 static bool test_enum_r_passwd(struct torture_context *tctx,
17 struct passwd **pwd_array_p,
19 @@ -381,6 +381,7 @@ static bool test_enum_r_passwd(struct to
25 static bool torture_assert_passwd_equal(struct torture_context *tctx,
26 const struct passwd *p1,
27 @@ -432,7 +433,7 @@ static bool test_passwd_r(struct torture
28 struct passwd *pwd, pwd1, pwd2;
31 - torture_assert(tctx, test_enum_r_passwd(tctx, &pwd, &num_pwd),
32 + torture_assert(tctx, test_enum_passwd(tctx, &pwd, &num_pwd),
33 "failed to enumerate passwd");
35 for (i=0; i < num_pwd; i++) {
36 @@ -460,7 +461,7 @@ static bool test_passwd_r_cross(struct t
37 struct passwd *pwd, pwd1, pwd2, pwd3, pwd4;
40 - torture_assert(tctx, test_enum_r_passwd(tctx, &pwd, &num_pwd),
41 + torture_assert(tctx, test_enum_passwd(tctx, &pwd, &num_pwd),
42 "failed to enumerate passwd");
44 for (i=0; i < num_pwd; i++) {
45 @@ -531,6 +532,7 @@ static bool test_enum_group(struct tortu
50 static bool test_enum_r_group(struct torture_context *tctx,
51 struct group **grp_array_p,
53 @@ -579,6 +581,7 @@ static bool test_enum_r_group(struct tor
59 static bool torture_assert_group_equal(struct torture_context *tctx,
60 const struct group *g1,
61 @@ -635,7 +638,7 @@ static bool test_group_r(struct torture_
62 struct group *grp, grp1, grp2;
65 - torture_assert(tctx, test_enum_r_group(tctx, &grp, &num_grp),
66 + torture_assert(tctx, test_enum_group(tctx, &grp, &num_grp),
67 "failed to enumerate group");
69 for (i=0; i < num_grp; i++) {
70 @@ -663,7 +666,7 @@ static bool test_group_r_cross(struct to
71 struct group *grp, grp1, grp2, grp3, grp4;
74 - torture_assert(tctx, test_enum_r_group(tctx, &grp, &num_grp),
75 + torture_assert(tctx, test_enum_group(tctx, &grp, &num_grp),
76 "failed to enumerate group");
78 for (i=0; i < num_grp; i++) {