The branch, v4-0-test has been updated
via e8769b7 s3-winbind: Improve performance of
wb_fill_pwent_sid2uid_done().
via 6b11557 Stop use after free
from 661f8af s3:dir - We now pass the previously spinning directory
tests on ext4.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit e8769b7b06e6d7d2d9f5d5e23c15bd01c56255f6
Author: Volker Lendecke <[email protected]>
Date: Thu Jan 16 16:10:25 2014 +0100
s3-winbind: Improve performance of wb_fill_pwent_sid2uid_done().
BUG: https://bugzilla.samba.org/show_bug.cgi?id=2191
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Thu Jan 16 20:17:24 CET 2014 on sn-devel-104
(cherry picked from commit 1a43778433934530d77791edd1af538de8b1d8a3)
Signed-off-by: Andreas Schneider <[email protected]>
Autobuild-User(v4-0-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-0-test): Fri Feb 14 00:04:34 CET 2014 on sn-devel-104
commit 6b115571b1d480476484a33eb70ca7f0e5a76c7f
Author: Alistair Leslie-Hughes <[email protected]>
Date: Fri Sep 27 08:31:00 2013 +1000
Stop use after free
Fixes bug #10087
Thanks to Man Min Yan for their analysis and providing a solution to the
issue.
Reviewed-by: Jeremy Allison <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Fri Sep 27 14:29:46 CEST 2013 on sn-devel-104
(cherry picked from commit 6bf9a774718917c3429fa1492f5b0268ae5e01c3)
-----------------------------------------------------------------------
Summary of changes:
source3/utils/ntlm_auth.c | 6 +++++-
source3/winbindd/wb_fill_pwent.c | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 7cf40b9..ad75e69 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -1678,7 +1678,11 @@ static void manage_gensec_request(enum stdio_helper_mode
stdio_helper_mode,
} else {
reply_code = "AF";
- reply_arg = session_info->unix_info->unix_name;
+ reply_arg = talloc_strdup(state->gensec_state,
session_info->unix_info->unix_name);
+ if (reply_arg == NULL) {
+ reply_code = "BH out of memory";
+ reply_arg = nt_errstr(NT_STATUS_NO_MEMORY);
+ }
talloc_free(session_info);
}
} else if (state->gensec_state->gensec_role == GENSEC_CLIENT) {
diff --git a/source3/winbindd/wb_fill_pwent.c b/source3/winbindd/wb_fill_pwent.c
index 9d0abbd..cd0ca50 100644
--- a/source3/winbindd/wb_fill_pwent.c
+++ b/source3/winbindd/wb_fill_pwent.c
@@ -91,7 +91,7 @@ static void wb_fill_pwent_sid2uid_done(struct tevent_req
*subreq)
state->pw->pw_uid = (uid_t)xid.id;
- subreq = wb_getgrsid_send(state, state->ev, &state->info->group_sid, 1);
+ subreq = wb_getgrsid_send(state, state->ev, &state->info->group_sid, 0);
if (tevent_req_nomem(subreq, req)) {
return;
}
--
Samba Shared Repository
