diff options
| author |   Dave Hughes <davidhughes205@gmail.com> | 2021-03-13 12:10:16 -0500 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-03-13 21:25:46 +0000 |
| commit | 28de7a61d38252fa922854eba018a046250976ed (patch) | |
| tree | 984b0afab662c83f9112f7c74523ae2868c56121 /net-fs/samba/files/getpwent_r.patch | |
| parent | media-libs/virglrenderer: remove from overlay (diff) | |
| download | musl-28de7a61d38252fa922854eba018a046250976ed.tar.gz musl-28de7a61d38252fa922854eba018a046250976ed.tar.bz2 musl-28de7a61d38252fa922854eba018a046250976ed.zip | |
net-fs/samba: sync with ::gentoo
Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --force
Manifest-Sign-Key: 0xA1919C830E9498E0
Signed-off-by: Dave Hughes <davidhughes205@gmail.com>
Closes: https://github.com/gentoo/musl/pull/421
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-fs/samba/files/getpwent_r.patch')
| -rw-r--r-- | net-fs/samba/files/getpwent_r.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/net-fs/samba/files/getpwent_r.patch b/net-fs/samba/files/getpwent_r.patch new file mode 100644 index 00000000..0ba5fcc5 --- /dev/null +++ b/net-fs/samba/files/getpwent_r.patch @@ -0,0 +1,80 @@ +diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c +index 2cd6122..04f13c6 100644 +--- a/source4/torture/local/nss_tests.c ++++ b/source4/torture/local/nss_tests.c +@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct torture_context *tctx, + return true; + } + +- + static bool test_getgrgid(struct torture_context *tctx, + gid_t gid, + struct group *grp_p) +@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct torture_context *tctx, + return true; + } + ++#if HAVE_GETPWENT_R + static bool test_enum_r_passwd(struct torture_context *tctx, + struct passwd **pwd_array_p, + size_t *num_pwd_p) +@@ -383,6 +383,7 @@ static bool test_enum_r_passwd(struct torture_context *tctx, + + return true; + } ++#endif + + static bool torture_assert_passwd_equal(struct torture_context *tctx, + const struct passwd *p1, +@@ -434,7 +435,7 @@ static bool test_passwd_r(struct torture_context *tctx) + struct passwd *pwd, pwd1, pwd2; + size_t num_pwd; + +- torture_assert(tctx, test_enum_r_passwd(tctx, &pwd, &num_pwd), ++ torture_assert(tctx, test_enum_passwd(tctx, &pwd, &num_pwd), + "failed to enumerate passwd"); + + for (i=0; i < num_pwd; i++) { +@@ -462,7 +463,7 @@ static bool test_passwd_r_cross(struct torture_context *tctx) + struct passwd *pwd, pwd1, pwd2, pwd3, pwd4; + size_t num_pwd; + +- torture_assert(tctx, test_enum_r_passwd(tctx, &pwd, &num_pwd), ++ torture_assert(tctx, test_enum_passwd(tctx, &pwd, &num_pwd), + "failed to enumerate passwd"); + + for (i=0; i < num_pwd; i++) { +@@ -533,6 +534,7 @@ static bool test_enum_group(struct torture_context *tctx, + return true; + } + ++#if HAVE_GETGRENT_R + static bool test_enum_r_group(struct torture_context *tctx, + struct group **grp_array_p, + size_t *num_grp_p) +@@ -583,6 +585,7 @@ static bool test_enum_r_group(struct torture_context *tctx, + + return true; + } ++#endif + + static bool torture_assert_group_equal(struct torture_context *tctx, + const struct group *g1, +@@ -639,7 +642,7 @@ static bool test_group_r(struct torture_context *tctx) + struct group *grp, grp1, grp2; + size_t num_grp; + +- torture_assert(tctx, test_enum_r_group(tctx, &grp, &num_grp), ++ torture_assert(tctx, test_enum_group(tctx, &grp, &num_grp), + "failed to enumerate group"); + + for (i=0; i < num_grp; i++) { +@@ -667,7 +670,7 @@ static bool test_group_r_cross(struct torture_context *tctx) + struct group *grp, grp1, grp2, grp3, grp4; + size_t num_grp; + +- torture_assert(tctx, test_enum_r_group(tctx, &grp, &num_grp), ++ torture_assert(tctx, test_enum_group(tctx, &grp, &num_grp), + "failed to enumerate group"); + + for (i=0; i < num_grp; i++) { |