aboutsummaryrefslogtreecommitdiff
path: root/net/samba4/patches/003-getpwent_r.patch
diff options
context:
space:
mode:
Diffstat (limited to 'net/samba4/patches/003-getpwent_r.patch')
-rw-r--r--net/samba4/patches/003-getpwent_r.patch20
1 files changed, 9 insertions, 11 deletions
diff --git a/net/samba4/patches/003-getpwent_r.patch b/net/samba4/patches/003-getpwent_r.patch
index 0ba5fcc53..4671aeae0 100644
--- a/net/samba4/patches/003-getpwent_r.patch
+++ b/net/samba4/patches/003-getpwent_r.patch
@@ -1,8 +1,6 @@
-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,
+@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct tortu
return true;
}
@@ -10,7 +8,7 @@ index 2cd6122..04f13c6 100644
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,
+@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct tort
return true;
}
@@ -18,7 +16,7 @@ index 2cd6122..04f13c6 100644
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,
+@@ -383,6 +383,7 @@ static bool test_enum_r_passwd(struct to
return true;
}
@@ -26,7 +24,7 @@ index 2cd6122..04f13c6 100644
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)
+@@ -434,7 +435,7 @@ static bool test_passwd_r(struct torture
struct passwd *pwd, pwd1, pwd2;
size_t num_pwd;
@@ -35,7 +33,7 @@ index 2cd6122..04f13c6 100644
"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)
+@@ -462,7 +463,7 @@ static bool test_passwd_r_cross(struct t
struct passwd *pwd, pwd1, pwd2, pwd3, pwd4;
size_t num_pwd;
@@ -44,7 +42,7 @@ index 2cd6122..04f13c6 100644
"failed to enumerate passwd");
for (i=0; i < num_pwd; i++) {
-@@ -533,6 +534,7 @@ static bool test_enum_group(struct torture_context *tctx,
+@@ -533,6 +534,7 @@ static bool test_enum_group(struct tortu
return true;
}
@@ -52,7 +50,7 @@ index 2cd6122..04f13c6 100644
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,
+@@ -583,6 +585,7 @@ static bool test_enum_r_group(struct tor
return true;
}
@@ -60,7 +58,7 @@ index 2cd6122..04f13c6 100644
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)
+@@ -639,7 +642,7 @@ static bool test_group_r(struct torture_
struct group *grp, grp1, grp2;
size_t num_grp;
@@ -69,7 +67,7 @@ index 2cd6122..04f13c6 100644
"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)
+@@ -667,7 +670,7 @@ static bool test_group_r_cross(struct to
struct group *grp, grp1, grp2, grp3, grp4;
size_t num_grp;