The branch, v4-0-test has been updated
via be0a7af spoolss: accept XPS_PASS datatype used by Windows 8
via 7dbcb14 smbd: Fix a talloc hierarchy problem in msg_channel
from 59da16e VERSION: Bump version number up to 4.0.13...
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit be0a7af9b3a216dd8a29e08b99ca71577a47560e
Author: Arvid Requate <requ...@univention.de>
Date: Thu Nov 21 12:35:20 2013 +0100
spoolss: accept XPS_PASS datatype used by Windows 8
The new v4 driver model used in Windows 8 declares print jobs
intended to bypass the XPS processing layer by setting datatype to
"XPS_PASS" instead of "RAW".
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10267
Reviewed-by: David Disseldorp <dd...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
(cherry picked from commit b2815b4c8c3e436a79fb7f07be285a417fd6e8cb)
Autobuild-User(v4-0-test): Karolin Seeger <ksee...@samba.org>
Autobuild-Date(v4-0-test): Fri Nov 22 13:47:19 CET 2013 on sn-devel-104
commit 7dbcb14e75740fd7793473d5b8b1db5ab0639c43
Author: Volker Lendecke <v...@samba.org>
Date: Thu Nov 14 21:30:49 2013 +0100
smbd: Fix a talloc hierarchy problem in msg_channel
When tearing down a watch_send with an open tevent_immediate, we
talloc_free the msg_channel while the tevent_immediate still references
it. Don't make the tevent_immediate outlive the msg_channel.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10250
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Wed Nov 20 00:13:51 CET 2013 on sn-devel-104
(cherry picked from commit 2d91577f984bc83c2c87141cfdda87d068060b32)
-----------------------------------------------------------------------
Summary of changes:
source3/lib/msg_channel.c | 2 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/msg_channel.c b/source3/lib/msg_channel.c
index c68c11e..1a30472 100644
--- a/source3/lib/msg_channel.c
+++ b/source3/lib/msg_channel.c
@@ -244,7 +244,7 @@ struct tevent_req *msg_read_send(TALLOC_CTX *mem_ctx,
num_msgs = talloc_array_length(channel->msgs);
if (num_msgs != 0) {
- im = tevent_create_immediate(channel->ev);
+ im = tevent_create_immediate(channel);
if (tevent_req_nomem(im, req)) {
return tevent_req_post(req, ev);
}
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c
b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 9ecf191..fa5f022 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -5771,7 +5771,13 @@ WERROR _spoolss_StartDocPrinter(struct pipes_struct *p,
*/
if (info_1->datatype) {
- if (strcmp(info_1->datatype, "RAW") != 0) {
+ /*
+ * The v4 driver model used in Windows 8 declares print jobs
+ * intended to bypass the XPS processing layer by setting
+ * datatype to "XPS_PASS" instead of "RAW".
+ */
+ if ((strcmp(info_1->datatype, "RAW") != 0)
+ && (strcmp(info_1->datatype, "XPS_PASS") != 0)) {
*r->out.job_id = 0;
return WERR_INVALID_DATATYPE;
}
--
Samba Shared Repository
