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 <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit a9a1a16cc8b87a84cdfa049ebd26bf4eac1b3618)

Autobuild-User(v4-3-test): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(v4-3-test): Thu Oct 13 20:12:54 CEST 2016 on sn-devel-104

diff --git a/source3/rpc_client/cli_winreg_spoolss.c b/source3/rpc_client/cli_winreg_spoolss.c
index ac4fe864df439b3aaffef775fb9b414da3f149a1..68ac05381b5126dd4b488bca0a6fca2f94ff732a 100644 (file)
--- 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;
 }