]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/samba/samba-3.6.99-add_spoolss_os_version.patch
Merge branch 'core110'
[ipfire-2.x.git] / src / patches / samba / samba-3.6.99-add_spoolss_os_version.patch
1 From e5d6a3914151217e1487d9a444c2ced4cfd89491 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
3 Date: Sat, 19 Jan 2013 01:37:29 +0100
4 Subject: [PATCH 19/20] PATCHSET9: s3-spoolss: Make it easier to manipulate the
5 returned OSVersion at runtime.
6 MIME-Version: 1.0
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
9
10 Guenther
11
12 Signed-off-by: Günther Deschner <gd@samba.org>
13 Reviewed-by: Andreas Schneider <asn@samba.org>
14 Signed-off-by: Andreas Schneider <asn@samba.org>
15 ---
16 source3/rpc_server/spoolss/srv_spoolss_nt.c | 14 +++++++++++---
17 1 file changed, 11 insertions(+), 3 deletions(-)
18
19 diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
20 index 8372c43..0c4b582 100644
21 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
22 +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
23 @@ -2352,9 +2352,13 @@ static WERROR getprinterdata_printer_server(TALLOC_CTX *mem_ctx,
24 enum ndr_err_code ndr_err;
25 struct spoolss_OSVersion os;
26
27 - os.major = 5; /* Windows 2000 == 5.0 */
28 - os.minor = 0;
29 - os.build = 2195; /* build */
30 + os.major = lp_parm_int(GLOBAL_SECTION_SNUM,
31 + "spoolss", "os_major", 5);
32 + /* Windows 2000 == 5.0 */
33 + os.minor = lp_parm_int(GLOBAL_SECTION_SNUM,
34 + "spoolss", "os_minor", 0);
35 + os.build = lp_parm_int(GLOBAL_SECTION_SNUM,
36 + "spoolss", "os_build", 2195);
37 os.extra_string = ""; /* leave extra string empty */
38
39 ndr_err = ndr_push_struct_blob(&blob, mem_ctx, &os,
40 @@ -2363,6 +2367,10 @@ static WERROR getprinterdata_printer_server(TALLOC_CTX *mem_ctx,
41 return WERR_GENERAL_FAILURE;
42 }
43
44 + if (DEBUGLEVEL >= 10) {
45 + NDR_PRINT_DEBUG(spoolss_OSVersion, &os);
46 + }
47 +
48 *type = REG_BINARY;
49 data->binary = blob;
50
51 --
52 1.9.0
53