[SCM] Samba Shared Repository - branch v4-3-test updated
Karolin Seeger
kseeger at samba.org
Thu Nov 5 13:52:05 UTC 2015
The branch, v4-3-test has been updated
via 88398fb s3:smb2_server: make the logic of SMB2_CANCEL DLIST_REMOVE() clearer
via f5faf95 s3-smbd: Fix use after issue in smbd_smb2_request_dispatch()
via c2b3914 manpage: corrected small typo error
via e63ff9f s4: fix linking smbtorture on Solaris.
from c900ae8 script/release.sh: make it possible to create stable .x releases (x >= 1)
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-3-test
- Log -----------------------------------------------------------------
commit 88398fbe70866250566e2fdf74019cb5e91bbbb1
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Nov 2 13:40:24 2015 +0100
s3:smb2_server: make the logic of SMB2_CANCEL DLIST_REMOVE() clearer
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11581
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit ad85c8905184d125a2a38569f7955ccbf443ebcd)
Autobuild-User(v4-3-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-3-test): Thu Nov 5 14:51:25 CET 2015 on sn-devel-104
commit f5faf950e38c0b8a4179373ecacb519f665a51a2
Author: Andreas Schneider <asn at samba.org>
Date: Fri Oct 30 09:01:28 2015 +0100
s3-smbd: Fix use after issue in smbd_smb2_request_dispatch()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11581
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Fri Oct 30 19:49:47 CET 2015 on sn-devel-104
(cherry picked from commit db9e10d071793b91b3f3d40225a8634e3c34f65e)
commit c2b3914de67bdabb6489e22a5cb19e63cbf8abac
Author: YvanM <yvan.masson at openmailbox.org>
Date: Sun Nov 1 11:53:45 2015 +0100
manpage: corrected small typo error
Corrected mistakes, probably comming from a too fast
"copy and paste", in the smb.conf manpage.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11584
Signed-off-by: YvanM <yvan.masson at openmailbox.org>
Reviewed-by: Björn Jacke <bj at sernet.de>
Reviewed-by: Karolin Seeger <kseeger at samba.org>
Autobuild-User(master): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(master): Mon Nov 2 14:43:15 CET 2015 on sn-devel-104
(cherry picked from commit d66863b1fff862aa2ae21a06116bc2a2b2f7a6ce)
commit e63ff9f9fad0e71840eadd2ae60cd417cfd0904b
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
(cherry picked from commit 8de1ed6d6e660760483a17f34842979384a655f9)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/security/aclgroupcontrol.xml | 2 +-
source3/smbd/smb2_server.c | 17 ++++++++++++++---
source4/torture/local/nss_tests.c | 4 ++++
3 files changed, 19 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/security/aclgroupcontrol.xml b/docs-xml/smbdotconf/security/aclgroupcontrol.xml
index 279a57b..fbc4c7d 100644
--- a/docs-xml/smbdotconf/security/aclgroupcontrol.xml
+++ b/docs-xml/smbdotconf/security/aclgroupcontrol.xml
@@ -30,7 +30,7 @@
</para>
<para>
- This is parameter has been was deprecated in Samba 3.0.23, but re-activated in
+ This parameter was deprecated in Samba 3.0.23, but re-activated in
Samba 3.0.31 and above, as it now only controls permission changes if the user
is in the owning primary group. It is now no longer equivalent to the
<parameter moreinfo="none">dos filemode</parameter> option.
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 40f3f2d..09633a3 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1704,11 +1704,12 @@ static NTSTATUS smbd_smb2_request_process_cancel(struct smbd_smb2_request *req)
search_async_id = BVAL(inhdr, SMB2_HDR_PID);
/*
- * we don't need the request anymore
- * cancel requests never have a response
+ * We don't need the request anymore cancel requests never
+ * have a response.
+ *
+ * We defer the TALLOC_FREE(req) to the caller.
*/
DLIST_REMOVE(xconn->smb2.requests, req);
- TALLOC_FREE(req);
for (cur = xconn->smb2.requests; cur; cur = cur->next) {
const uint8_t *outhdr;
@@ -2350,6 +2351,16 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
req->profile, _INBYTES(req));
return_value = smbd_smb2_request_process_cancel(req);
SMBPROFILE_IOBYTES_ASYNC_END(req->profile, 0);
+
+ /*
+ * We don't need the request anymore cancel requests never
+ * have a response.
+ *
+ * smbd_smb2_request_process_cancel() already called
+ * DLIST_REMOVE(xconn->smb2.requests, req);
+ */
+ TALLOC_FREE(req);
+
break;
case SMB2_OP_KEEPALIVE:
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
More information about the samba-cvs
mailing list