git.samba.org
/
martins
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b9d73fb
)
s3-spoolss: also set new os_major,minor,build values in printer info 0
author
Günther Deschner
<gd@samba.org>
Wed, 16 Nov 2016 18:17:55 +0000
(19:17 +0100)
committer
Jeremy Allison
<jra@samba.org>
Sun, 20 Nov 2016 01:28:10 +0000
(
02:28
+0100)
Guenther
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/rpc_server/spoolss/srv_spoolss_nt.c
patch
|
blob
|
history
diff --git
a/source3/rpc_server/spoolss/srv_spoolss_nt.c
b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 8a32db8c4c7af81fb35f2dbe55764ba60cf02a4a..7f9f59be456067b18383328cf925a958b4d87104 100644
(file)
--- a/
source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/
source3/rpc_server/spoolss/srv_spoolss_nt.c
@@
-3870,6
+3870,7
@@
static WERROR construct_printer_info0(TALLOC_CTX *mem_ctx,
struct timeval setuptime;
print_status_struct status;
WERROR result;
struct timeval setuptime;
print_status_struct status;
WERROR result;
+ int os_major, os_minor, os_build;
result = create_printername(mem_ctx, servername, info2->printername, &r->printername);
if (!W_ERROR_IS_OK(result)) {
result = create_printername(mem_ctx, servername, info2->printername, &r->printername);
if (!W_ERROR_IS_OK(result)) {
@@
-3916,9
+3917,20
@@
static WERROR construct_printer_info0(TALLOC_CTX *mem_ctx,
*/
r->global_counter = session_counter->counter;
r->total_pages = 0;
*/
r->global_counter = session_counter->counter;
r->total_pages = 0;
+
/* in 2.2 we reported ourselves as 0x0004 and 0x0565 */
/* in 2.2 we reported ourselves as 0x0004 and 0x0565 */
- SSVAL(&r->version, 0, 0x0005); /* NT 5 */
- SSVAL(&r->version, 2, 0x0893); /* build 2195 */
+
+ os_major = lp_parm_int(GLOBAL_SECTION_SNUM,
+ "spoolss", "os_major", 5);
+ os_minor = lp_parm_int(GLOBAL_SECTION_SNUM,
+ "spoolss", "os_minor", 2);
+ os_build = lp_parm_int(GLOBAL_SECTION_SNUM,
+ "spoolss", "os_build", 3790);
+
+ SCVAL(&r->version, 0, os_major);
+ SCVAL(&r->version, 1, os_minor);
+ SSVAL(&r->version, 2, os_build);
+
r->free_build = SPOOLSS_RELEASE_BUILD;
r->spooling = 0;
r->max_spooling = 0;
r->free_build = SPOOLSS_RELEASE_BUILD;
r->spooling = 0;
r->max_spooling = 0;