The branch, v4-3-test has been updated
via 2014c08 s3-spoolss: fix winreg_printer_ver_to_qword
via e0c9067 gencache: Bail out of stabilize if we can not get the
allrecord lock
from 0b0574e lib: poll_funcs : poll_funcs_context_slot_find can select
the wrong slot to replace.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-3-test
- Log -----------------------------------------------------------------
commit 2014c088d32daf5efe93fd9843c7a395907b4499
Author: Günther Deschner <g...@samba.org>
Date: Mon Sep 12 17:55:37 2016 +0200
s3-spoolss: fix winreg_printer_ver_to_qword
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12285
We were reporting the OS minor number as the driver version number in all
GetDriver/EnumDriver calls.
Guenther
Signed-off-by: Guenther Deschner <g...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
(cherry picked from commit a9a1a16cc8b87a84cdfa049ebd26bf4eac1b3618)
Autobuild-User(v4-3-test): Stefan Metzmacher <me...@samba.org>
Autobuild-Date(v4-3-test): Thu Oct 13 20:12:54 CEST 2016 on sn-devel-104
commit e0c9067b4a46147057ec3454bb4d0a9e27bc854e
Author: Volker Lendecke <v...@samba.org>
Date: Mon Sep 19 14:29:21 2016 -0700
gencache: Bail out of stabilize if we can not get the allrecord lock
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12045
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): Tue Sep 20 04:09:33 CEST 2016 on sn-devel-144
(cherry picked from commit b208499960eefef02d305a3bd59b03a7c2aafcac)
-----------------------------------------------------------------------
Summary of changes:
source3/lib/gencache.c | 2 +-
source3/rpc_client/cli_winreg_spoolss.c | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index 90eafaa..7ac9eba 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -658,7 +658,7 @@ bool gencache_stabilize(void)
return false;
}
- res = tdb_lockall(cache_notrans->tdb);
+ res = tdb_lockall_nonblock(cache_notrans->tdb);
if (res != 0) {
tdb_transaction_cancel(cache->tdb);
DEBUG(10, ("Could not get allrecord lock on "
diff --git a/source3/rpc_client/cli_winreg_spoolss.c
b/source3/rpc_client/cli_winreg_spoolss.c
index ac4fe86..68ac053 100644
--- a/source3/rpc_client/cli_winreg_spoolss.c
+++ b/source3/rpc_client/cli_winreg_spoolss.c
@@ -529,8 +529,9 @@ static WERROR winreg_printer_write_ver(TALLOC_CTX *mem_ctx,
NTSTATUS status;
char *str;
- /* FIXME: check format is right,
- * this needs to be something like: 6.1.7600.16385 */
+ /*
+ * this needs to be something like: 6.1.7600.16385
+ */
str = talloc_asprintf(mem_ctx, "%u.%u.%u.%u",
(unsigned)((data >> 48) & 0xFFFF),
(unsigned)((data >> 32) & 0xFFFF),
@@ -574,7 +575,7 @@ static WERROR winreg_printer_ver_to_dword(const char *str,
uint64_t *data)
*data = ((uint64_t)(v1 & 0xFFFF) << 48) +
((uint64_t)(v2 & 0xFFFF) << 32) +
((uint64_t)(v3 & 0xFFFF) << 16) +
- (uint64_t)(v2 & 0xFFFF);
+ (uint64_t)(v4 & 0xFFFF);
return WERR_OK;
}
--
Samba Shared Repository
