[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Sun Aug 8 08:03:52 MDT 2010
The branch, master has been updated
via cc280f0... s3: Lift the smbd_messaging_context from print_queue_purge
via 9723f33... s3: Lift the smbd_messaging_context from print_queue_resume
via 5f9165a... s3: Lift the smbd_messaging_context from print_queue_pause
via 9441e8c... s3: Lift the smbd_messaging_context from print_job_start
via bff8713... s3: Lift the smbd_messaging_context from print_job_checks
via 7df0e67... s3: Lift the smbd_messaging_context from print_job_resume
via 2811c25... s3: Lift the smbd_messaging_context from print_job_pause
via 8dcbeec... s3: Lift the smbd_messaging_context from print_job_delete
via 4a514d2... s3: Lift the smbd_messaging_context from construct_printer_info7
via 99b2da4... s3: Lift the smbd_messaging_context from is_printer_published
via bccb7c8... s3: Lift the smbd_messaging_context from check_published_printers
via 7d08c25... s3: Lift the smbd_messaging_context from nt_printer_publish
via 6183719... s3: Lift the smbd_messaging_context from nt_printer_publish_ads
via 8c665f6... s3: Lift the smbd_messaging_context from store_printer_guid
via e43ffde... s3: Lift the smbd_messaging_context from nt_printer_remove
via 39ce462... s3: Lift the smbd_messaging_context from print_time_access_check
via be7fd4a... s3: Lift the smbd_messaging_context from print_access_check
via d79895e... s3: Lift the smbd_messaging_context from printer_driver_files_in_use
via 862e888... s3: Lift the smbd_messaging_context from printer_driver_in_use
via 51c47a3... s3: Lift the smbd_messaging_context from netr_set_machine_account_password
via ae8619f... s3: Lift the smbd_messaging_context from get_md4pw
via 7850496... s3: Lift the smbd_messaging_context from enumprinterdrivers_level
via ab196c7... s3: Lift the smbd_messaging_context from enumprinterdrivers_level_by_architecture
via e1af63f... s3: Lift the smbd_messaging_context from update_dsspooler
via 8ee2a0a... s3: Lift the smbd_messaging_context from construct_printer_driver_info_level
via 9daa6a2... s3: Lift the smbd_messaging_context from enumprinters_level5
via d7803ea... s3: Lift the smbd_messaging_context from enumprinters_level4
via 89d8998... s3: Lift the smbd_messaging_context from enumprinters_level2
via e35ac20... s3: Lift the smbd_messaging_context from enumprinters_level1
via bf10fa6... s3: Lift the smbd_messaging_context from enum_all_printers_info_2
via ada007d... s3: Lift the smbd_messaging_context from enum_all_printers_info_1_network
via 2c0e630... s3: Lift the smbd_messaging_context from enum_all_printers_info_1_name
via 6dc35f8... s3: Lift the smbd_messaging_context from enum_all_printers_info_1_local
via 67fbb04... s3: Lift the smbd_messaging_context from enum_all_printers_info_1
via 259b9d7... s3: Lift the smbd_messaging_context from enumprinters_level0
via 1a3ba2f... s3: Lift the smbd_messaging_context from enum_all_printers_info_level
via 5b0a36b... s3: Lift the smbd_messaging_context from construct_printer_info0
via f776d10... s3: Lift the smbd_messaging_context from set_printer_hnd_name
via 1af73b0... s3: Lift the smbd_messaging_context from winreg_del_driver_list
via d104e37... s3: Lift the smbd_messaging_context from winreg_del_driver
via ae6a3ac... s3: Lift the smbd_messaging_context from winreg_get_driver
via 3a85d0c... s3: Lift the smbd_messaging_context from winreg_add_driver
via 6bd973a... s3: Lift the smbd_messaging_context from winreg_printer_getform1
via d78c8c2... s3: Lift the smbd_messaging_context from winreg_printer_setform1
via cf016e3... s3: Lift the smbd_messaging_context from winreg_printer_deleteform1
via 428e86e... s3: Lift the smbd_messaging_context from winreg_printer_enumforms1
via fe59853... s3: Lift the smbd_messaging_context from winreg_printer_addform1
via b9fe8de... s3: Lift the smbd_messaging_context from winreg_printer_get_changeid
via 8efa27c... s3: Lift the smbd_messaging_context from winreg_printer_update_changeid
via 747f5c5... s3: Lift the smbd_messaging_context from winreg_delete_printer_key
via 3ccdbc4... s3: Lift the smbd_messaging_context from winreg_enum_printer_key
via 30d64d2... s3: Lift the smbd_messaging_context from winreg_delete_printer_dataex
via 9346df6... s3: Lift the smbd_messaging_context from winreg_enum_printer_dataex
via cb8f700... s3: Lift the smbd_messaging_context from winreg_get_printer_dataex
via e4cd349... s3: Lift the smbd_messaging_context from winreg_set_printer_dataex
via 7471ecb... s3: Lift the smbd_messaging_context from winreg_set_printer_secdesc
via 4fb993f... s3: Lift the smbd_messaging_context from winreg_get_printer_secdesc
via bd8a1d8... s3: Lift the smbd_messaging_context from winreg_get_printer
via 9751d76... s3: Lift the smbd_messaging_context from winreg_update_printer
via d7f8a6f... s3: Lift the smbd_messaging_context from winreg_create_printer
via 2eb5863... s3: Lift the smbd_messaging_context from winreg_printer_opendriver
via c29e1c3... s3: Lift the smbd_messaging_context from winreg_printer_openkey
via 80cda2e... s3: Lift the smbd_messaging_context from nt_printing_tdb_migrate
via 2d36235... s3: Lift the smbd_messaging_context from rpc_pipe_open_internal
via 33256d6... s3: Lift the smbd_messaging_context from np_open
via 7c90a6b... s3: Lift the smbd_messaging_context from make_internal_rpc_pipe_p
via d5b8a99... s3: Remove a direct reference to smbd_server_conn
via 5acb5b0... s3: Remove references to smbd_messaging_context()
from 43c2dca... s3: Fix a type-punned warning
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cc280f0cd1f970b044011dee386e15ec87eccec8
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:52:59 2010 +0200
s3: Lift the smbd_messaging_context from print_queue_purge
commit 9723f33ef54235b27d0126810fdd7546d2510f23
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:51:40 2010 +0200
s3: Lift the smbd_messaging_context from print_queue_resume
commit 5f9165a7eaa081b15f2ca435ca86210eaa5c4752
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:50:15 2010 +0200
s3: Lift the smbd_messaging_context from print_queue_pause
commit 9441e8c52c4d624f80bf826daa312b45cd0a80f4
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:48:30 2010 +0200
s3: Lift the smbd_messaging_context from print_job_start
commit bff871384a281dab89a3117cfcb45f7cbe0824dd
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:47:18 2010 +0200
s3: Lift the smbd_messaging_context from print_job_checks
commit 7df0e672f237b01f69f1d8671732c56634e49d64
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:46:04 2010 +0200
s3: Lift the smbd_messaging_context from print_job_resume
commit 2811c258f6e01d10c0eb0cb0537f96bf5f1d6275
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:44:32 2010 +0200
s3: Lift the smbd_messaging_context from print_job_pause
commit 8dcbeecd6d0aac40da23aef8a4e126faa1bf43e2
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:42:47 2010 +0200
s3: Lift the smbd_messaging_context from print_job_delete
commit 4a514d2261b7528696f96bb29717fb7a20708869
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:40:46 2010 +0200
s3: Lift the smbd_messaging_context from construct_printer_info7
commit 99b2da4504307b6eefc6afbd502d931d29625ea0
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:39:40 2010 +0200
s3: Lift the smbd_messaging_context from is_printer_published
commit bccb7c87cca02adacd7ede9b60d543b8b3b1eb29
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:37:47 2010 +0200
s3: Lift the smbd_messaging_context from check_published_printers
commit 7d08c25f989df14131567d055a9c922e27247c14
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:35:50 2010 +0200
s3: Lift the smbd_messaging_context from nt_printer_publish
commit 61837197d8e0583d1ced7edd57353a72699495bb
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:33:45 2010 +0200
s3: Lift the smbd_messaging_context from nt_printer_publish_ads
commit 8c665f6da62f7b181bc975212ec5e486af401a44
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:32:37 2010 +0200
s3: Lift the smbd_messaging_context from store_printer_guid
commit e43ffde91f6781c135d4125b91911e79c06a7409
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:31:14 2010 +0200
s3: Lift the smbd_messaging_context from nt_printer_remove
commit 39ce462043d32e94b71a98001a43a95360017528
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:29:39 2010 +0200
s3: Lift the smbd_messaging_context from print_time_access_check
commit be7fd4ae5054435b25b1a6a460b626d556f39936
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:28:17 2010 +0200
s3: Lift the smbd_messaging_context from print_access_check
commit d79895e82606bcfe265a67bf9a6b7e03368f0bae
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:24:48 2010 +0200
s3: Lift the smbd_messaging_context from printer_driver_files_in_use
commit 862e888f71119b528d72290ad565d5a6203b4f17
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:23:12 2010 +0200
s3: Lift the smbd_messaging_context from printer_driver_in_use
commit 51c47a330257c58e8c3b5db197df07cf3bf7d9a1
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:20:48 2010 +0200
s3: Lift the smbd_messaging_context from netr_set_machine_account_password
commit ae8619f703d3ee7d639a79afbcfbd3dd66845c45
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:19:53 2010 +0200
s3: Lift the smbd_messaging_context from get_md4pw
commit 7850496fe79c3e60a7dd87629a25b054e7bf3439
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:17:21 2010 +0200
s3: Lift the smbd_messaging_context from enumprinterdrivers_level
commit ab196c7bfb531e854b1b4fce54c6b9c113991b6d
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:16:24 2010 +0200
s3: Lift the smbd_messaging_context from enumprinterdrivers_level_by_architecture
commit e1af63fdeefdaa1ed2f6723a2fe6d8cf8fe1f40b
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:14:33 2010 +0200
s3: Lift the smbd_messaging_context from update_dsspooler
commit 8ee2a0a26917729212b8c91a54bb4231e6bd6cb1
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:12:57 2010 +0200
s3: Lift the smbd_messaging_context from construct_printer_driver_info_level
commit 9daa6a2501a1486aa78e7eed71d12a404df2e882
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:11:39 2010 +0200
s3: Lift the smbd_messaging_context from enumprinters_level5
commit d7803ea49c1412296220b0496e0ace7f67571237
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:11:03 2010 +0200
s3: Lift the smbd_messaging_context from enumprinters_level4
commit 89d8998d7c0f386e106817ead9ec4360b3c2f1de
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:10:11 2010 +0200
s3: Lift the smbd_messaging_context from enumprinters_level2
commit e35ac20ca32e9c4221da6320706eb3562b544302
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:08:58 2010 +0200
s3: Lift the smbd_messaging_context from enumprinters_level1
commit bf10fa67ef423d37b70b5c53990fd6ff98f4566d
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:07:37 2010 +0200
s3: Lift the smbd_messaging_context from enum_all_printers_info_2
commit ada007d971dfa429fa6add8bfb8436cc824cd123
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:05:46 2010 +0200
s3: Lift the smbd_messaging_context from enum_all_printers_info_1_network
commit 2c0e63067b61461368fe7b725b732274101ecd95
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:04:56 2010 +0200
s3: Lift the smbd_messaging_context from enum_all_printers_info_1_name
commit 6dc35f8f70eee4ae536ea17e4b5cb223cbb4c501
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:03:52 2010 +0200
s3: Lift the smbd_messaging_context from enum_all_printers_info_1_local
commit 67fbb0462e5ac5a752f990da653e0492f2e12166
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 14:02:52 2010 +0200
s3: Lift the smbd_messaging_context from enum_all_printers_info_1
commit 259b9d7809f31202c544c6536f3ef98c93bb0fd0
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 11:01:58 2010 +0200
s3: Lift the smbd_messaging_context from enumprinters_level0
commit 1a3ba2f6eb9a5b1af6722f780761fcde45a896db
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 11:00:22 2010 +0200
s3: Lift the smbd_messaging_context from enum_all_printers_info_level
commit 5b0a36b552f44e6fb6110588773005a3f7c1d739
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:58:04 2010 +0200
s3: Lift the smbd_messaging_context from construct_printer_info0
commit f776d107a1459d943a1f5797d48d58ae24d50c39
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:56:50 2010 +0200
s3: Lift the smbd_messaging_context from set_printer_hnd_name
commit 1af73b04fc30c6be8a9fa792e2ecdb1affb9996b
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:55:41 2010 +0200
s3: Lift the smbd_messaging_context from winreg_del_driver_list
commit d104e37ed12653008301d68a584d76270a558ca4
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:54:01 2010 +0200
s3: Lift the smbd_messaging_context from winreg_del_driver
commit ae6a3ac22503fe342e7e04f83dd6c7a449e204ea
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:52:19 2010 +0200
s3: Lift the smbd_messaging_context from winreg_get_driver
commit 3a85d0c79a660555b5dfaaf38340900edb624d3f
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:47:35 2010 +0200
s3: Lift the smbd_messaging_context from winreg_add_driver
commit 6bd973ad0128f6abaa976289c549132451f9625b
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:46:00 2010 +0200
s3: Lift the smbd_messaging_context from winreg_printer_getform1
commit d78c8c26e4ae720734eb7ce2409b128fff362bbb
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:44:13 2010 +0200
s3: Lift the smbd_messaging_context from winreg_printer_setform1
commit cf016e3e494765f40b4866bd81dd91b8694dd833
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:41:54 2010 +0200
s3: Lift the smbd_messaging_context from winreg_printer_deleteform1
commit 428e86e562e830093b9af6bab09e851a4163b934
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:39:42 2010 +0200
s3: Lift the smbd_messaging_context from winreg_printer_enumforms1
commit fe5985316c9b63057b68f7ce6bf0062fe61edbeb
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:37:43 2010 +0200
s3: Lift the smbd_messaging_context from winreg_printer_addform1
commit b9fe8de0ff7d0a44c5d0169b552a673e3d225524
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:35:57 2010 +0200
s3: Lift the smbd_messaging_context from winreg_printer_get_changeid
commit 8efa27cdbea926d55b4ae43884796910a2b0b85e
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:34:00 2010 +0200
s3: Lift the smbd_messaging_context from winreg_printer_update_changeid
commit 747f5c531862ba3f06f1b8c54eed5c01e549efc8
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:29:50 2010 +0200
s3: Lift the smbd_messaging_context from winreg_delete_printer_key
commit 3ccdbc4119ca50b4a745b820f05f0a0f0965e827
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:27:40 2010 +0200
s3: Lift the smbd_messaging_context from winreg_enum_printer_key
commit 30d64d2f92a0edd8c62ed0b0fb14ff695b808714
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:25:54 2010 +0200
s3: Lift the smbd_messaging_context from winreg_delete_printer_dataex
commit 9346df6289b17c4c4e53e77922788ec8fcc071df
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:23:49 2010 +0200
s3: Lift the smbd_messaging_context from winreg_enum_printer_dataex
commit cb8f700855eb0867aad38c3b653c00e416cdd870
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:22:11 2010 +0200
s3: Lift the smbd_messaging_context from winreg_get_printer_dataex
commit e4cd34926f3d8c8f0c567467de39d47cf4b816f7
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:19:35 2010 +0200
s3: Lift the smbd_messaging_context from winreg_set_printer_dataex
commit 7471ecb27f1bcec6f75b58bd34d4c42fd9434f14
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:14:31 2010 +0200
s3: Lift the smbd_messaging_context from winreg_set_printer_secdesc
commit 4fb993f61346b783e100839879211825b5568336
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:11:00 2010 +0200
s3: Lift the smbd_messaging_context from winreg_get_printer_secdesc
commit bd8a1d8a8601474e1cf7cec459d05e2fe45b28b0
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 10:08:22 2010 +0200
s3: Lift the smbd_messaging_context from winreg_get_printer
commit 9751d7613b3db543a2cdb515c597d9600531dd76
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 09:37:43 2010 +0200
s3: Lift the smbd_messaging_context from winreg_update_printer
commit d7f8a6f82d56d7d46a0bcf8ed833ad09b9d00f26
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 09:34:23 2010 +0200
s3: Lift the smbd_messaging_context from winreg_create_printer
commit 2eb58637221899b63da4eb819d23284031f27976
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 09:32:12 2010 +0200
s3: Lift the smbd_messaging_context from winreg_printer_opendriver
commit c29e1c3e41ff0e85f053b2c40dae0f27098bcd79
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 09:30:30 2010 +0200
s3: Lift the smbd_messaging_context from winreg_printer_openkey
commit 80cda2e807ee32e3a1e3f93097310798fa4a3814
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 09:27:04 2010 +0200
s3: Lift the smbd_messaging_context from nt_printing_tdb_migrate
commit 2d3623529fed0be2945cecfb19cef579e5af057e
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 09:22:05 2010 +0200
s3: Lift the smbd_messaging_context from rpc_pipe_open_internal
commit 33256d6478381af3bee9ef064566e69cb4943c39
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 09:11:45 2010 +0200
s3: Lift the smbd_messaging_context from np_open
commit 7c90a6bf38829dc6be026b65b29b81db9fbbdf0d
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 09:08:40 2010 +0200
s3: Lift the smbd_messaging_context from make_internal_rpc_pipe_p
commit d5b8a993e0d782b123ed537709c28efede468419
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 8 08:47:05 2010 +0200
s3: Remove a direct reference to smbd_server_conn
commit 5acb5b09ee4d00cee83b7df3bc0a52894e9f303d
Author: Volker Lendecke <vl at samba.org>
Date: Sat Aug 7 18:39:38 2010 +0200
s3: Remove references to smbd_messaging_context()
-----------------------------------------------------------------------
Summary of changes:
source3/include/nt_printing.h | 12 +-
source3/include/printing.h | 23 ++-
source3/include/proto.h | 8 +-
source3/printing/nt_printing.c | 30 ++-
source3/printing/nt_printing_ads.c | 31 ++--
source3/printing/nt_printing_migrate.c | 3 +-
source3/printing/nt_printing_migrate.h | 2 +-
source3/printing/printing.c | 46 +++--
source3/rpc_server/rpc_ncacn_np_internal.c | 8 +-
source3/rpc_server/srv_netlog_nt.c | 14 +-
source3/rpc_server/srv_pipe_hnd.c | 5 +-
source3/rpc_server/srv_spoolss_nt.c | 272 ++++++++++++++++++++--------
source3/rpc_server/srv_spoolss_util.c | 61 ++++++-
source3/rpc_server/srv_spoolss_util.h | 22 +++
source3/smbd/lanman.c | 11 +-
source3/smbd/pipes.c | 4 +-
source3/smbd/process.c | 2 +-
source3/smbd/server_reload.c | 8 +-
source3/smbd/smb2_glue.c | 2 +-
source3/winbindd/winbindd_samr.c | 2 +
20 files changed, 421 insertions(+), 145 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index a185aab..7ebacc6 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -187,6 +187,7 @@ typedef struct _Printer{
uint32 change;
/* are we in a FindNextPrinterChangeNotify() call? */
bool fnpcn;
+ struct messaging_context *msg_ctx;
} notify;
struct {
fstring machine;
@@ -236,29 +237,34 @@ WERROR spoolss_map_to_os2_driver(TALLOC_CTX *mem_ctx, const char **pdrivername);
const char *get_short_archi(const char *long_archi);
-bool print_access_check(struct auth_serversupplied_info *server_info, int snum,
+bool print_access_check(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx, int snum,
int access_type);
WERROR nt_printer_publish(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
struct spoolss_PrinterInfo2 *pinfo2,
int action);
bool is_printer_published(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
char *servername, char *printer, struct GUID *guid,
struct spoolss_PrinterInfo2 **info2);
-WERROR check_published_printers(void);
+WERROR check_published_printers(struct messaging_context *msg_ctx);
bool driver_info_ctr_to_info8(struct spoolss_AddDriverInfoCtr *r,
struct spoolss_DriverInfo8 *_info8);
bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const struct spoolss_DriverInfo8 *r);
bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
struct spoolss_DriverInfo8 *r);
bool delete_driver_files(struct auth_serversupplied_info *server_info,
const struct spoolss_DriverInfo8 *r);
@@ -276,10 +282,12 @@ void map_printer_permissions(struct security_descriptor *sd);
void map_job_permissions(struct security_descriptor *sd);
bool print_time_access_check(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *servicename);
void nt_printer_remove(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *printer);
#endif /* NT_PRINTING_H_ */
diff --git a/source3/include/printing.h b/source3/include/printing.h
index eb277c9..95b0ec6 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -125,14 +125,18 @@ struct spoolss_DeviceMode *print_job_devmode(const char* sharename, uint32 jobid
bool print_job_set_name(const char *sharename, uint32 jobid, const char *name);
bool print_job_get_name(TALLOC_CTX *mem_ctx, const char *sharename, uint32_t jobid, char **name);
WERROR print_job_delete(struct auth_serversupplied_info *server_info,
- int snum, uint32 jobid);
-bool print_job_pause(struct auth_serversupplied_info *server_info, int snum,
- uint32 jobid, WERROR *errcode);
-bool print_job_resume(struct auth_serversupplied_info *server_info, int snum,
- uint32 jobid, WERROR *errcode);
+ struct messaging_context *msg_ctx,
+ int snum, uint32_t jobid);
+bool print_job_pause(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
+ int snum, uint32 jobid, WERROR *errcode);
+bool print_job_resume(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
+ int snum, uint32 jobid, WERROR *errcode);
ssize_t print_job_write(int snum, uint32 jobid, const char *buf, SMB_OFF_T pos, size_t size);
int print_queue_length(int snum, print_status_struct *pstatus);
WERROR print_job_start(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
int snum, const char *docname, const char *filename,
struct spoolss_DeviceMode *devmode, uint32_t *_jobid);
void print_job_endpage(int snum, uint32 jobid);
@@ -140,8 +144,11 @@ NTSTATUS print_job_end(int snum, uint32 jobid, enum file_close_type close_type);
int print_queue_status(int snum,
print_queue_struct **ppqueue,
print_status_struct *status);
-WERROR print_queue_pause(struct auth_serversupplied_info *server_info, int snum);
-WERROR print_queue_resume(struct auth_serversupplied_info *server_info, int snum);
-WERROR print_queue_purge(struct auth_serversupplied_info *server_info, int snum);
+WERROR print_queue_pause(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx, int snum);
+WERROR print_queue_resume(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx, int snum);
+WERROR print_queue_purge(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx, int snum);
#endif /* PRINTING_H_ */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 060776f..4937c62 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4497,9 +4497,12 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path,
struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
const struct ndr_syntax_id *syntax,
const char *client_address,
- struct auth_serversupplied_info *server_info);
-NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *abstract_syntax,
+ struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx);
+NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
+ const struct ndr_syntax_id *abstract_syntax,
struct auth_serversupplied_info *serversupplied_info,
+ struct messaging_context *msg_ctx,
struct rpc_pipe_client **presult);
NTSTATUS rpc_connect_spoolss_pipe(connection_struct *conn,
struct rpc_pipe_client **spoolss_pipe);
@@ -4719,6 +4722,7 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
const struct tsocket_address *local_address,
const struct tsocket_address *remote_address,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
struct fake_file_handle **phandle);
bool np_read_in_progress(struct fake_file_handle *handle);
struct tevent_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index ae44d57..0b23a97 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -96,7 +96,7 @@ bool nt_printing_init(struct messaging_context *msg_ctx)
msgs. This is done in serverid_register() */
if ( lp_security() == SEC_ADS ) {
- win_rc = check_published_printers();
+ win_rc = check_published_printers(msg_ctx);
if (!W_ERROR_IS_OK(win_rc))
DEBUG(0, ("nt_printing_init: error checking published printers: %s\n", win_errstr(win_rc)));
}
@@ -1553,6 +1553,7 @@ bool driver_info_ctr_to_info8(struct spoolss_AddDriverInfoCtr *r,
bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const struct spoolss_DriverInfo8 *r)
{
int snum;
@@ -1574,8 +1575,9 @@ bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
continue;
}
- result = winreg_get_printer(mem_ctx, server_info, NULL,
- lp_servicename(snum), &pinfo2);
+ result = winreg_get_printer(mem_ctx, server_info, msg_ctx,
+ NULL, lp_servicename(snum),
+ &pinfo2);
if (!W_ERROR_IS_OK(result)) {
continue; /* skip */
}
@@ -1599,18 +1601,18 @@ bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
"Windows NT x86" version 2 or 3 left */
if (!strequal("Windows NT x86", r->architecture)) {
- werr = winreg_get_driver(mem_ctx, server_info,
+ werr = winreg_get_driver(mem_ctx, server_info, msg_ctx,
"Windows NT x86",
r->driver_name,
DRIVER_ANY_VERSION,
&driver);
} else if (r->version == 2) {
- werr = winreg_get_driver(mem_ctx, server_info,
+ werr = winreg_get_driver(mem_ctx, server_info, msg_ctx,
"Windows NT x86",
r->driver_name,
3, &driver);
} else if (r->version == 3) {
- werr = winreg_get_driver(mem_ctx, server_info,
+ werr = winreg_get_driver(mem_ctx, server_info, msg_ctx,
"Windows NT x86",
r->driver_name,
2, &driver);
@@ -1779,6 +1781,7 @@ static bool trim_overlap_drv_files(TALLOC_CTX *mem_ctx,
bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
struct spoolss_DriverInfo8 *info)
{
int i;
@@ -1800,7 +1803,7 @@ bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
/* get the list of drivers */
- result = winreg_get_driver_list(mem_ctx, server_info,
+ result = winreg_get_driver_list(mem_ctx, server_info, msg_ctx,
info->architecture, version,
&num_drivers, &drivers);
if (!W_ERROR_IS_OK(result)) {
@@ -1817,7 +1820,7 @@ bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
driver = NULL;
- result = winreg_get_driver(mem_ctx, server_info,
+ result = winreg_get_driver(mem_ctx, server_info, msg_ctx,
info->architecture, drivers[i],
version, &driver);
if (!W_ERROR_IS_OK(result)) {
@@ -2060,7 +2063,8 @@ void map_job_permissions(struct security_descriptor *sd)
3) "printer admins" (may result in numerous calls to winbind)
****************************************************************************/
-bool print_access_check(struct auth_serversupplied_info *server_info, int snum,
+bool print_access_check(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx, int snum,
int access_type)
{
struct spoolss_security_descriptor *secdesc = NULL;
@@ -2099,6 +2103,7 @@ bool print_access_check(struct auth_serversupplied_info *server_info, int snum,
result = winreg_get_printer_secdesc(mem_ctx,
server_info,
+ msg_ctx,
pname,
&secdesc);
if (!W_ERROR_IS_OK(result)) {
@@ -2162,6 +2167,7 @@ bool print_access_check(struct auth_serversupplied_info *server_info, int snum,
*****************************************************************************/
bool print_time_access_check(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *servicename)
{
struct spoolss_PrinterInfo2 *pinfo2 = NULL;
@@ -2171,7 +2177,7 @@ bool print_time_access_check(struct auth_serversupplied_info *server_info,
struct tm *t;
uint32 mins;
- result = winreg_get_printer(NULL, server_info,
+ result = winreg_get_printer(NULL, server_info, msg_ctx,
NULL, servicename, &pinfo2);
if (!W_ERROR_IS_OK(result)) {
return False;
@@ -2199,11 +2205,13 @@ bool print_time_access_check(struct auth_serversupplied_info *server_info,
void nt_printer_remove(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *printer)
{
WERROR result;
- result = winreg_delete_printer_key(mem_ctx, server_info, printer, "");
+ result = winreg_delete_printer_key(mem_ctx, server_info, msg_ctx,
+ printer, "");
if (!W_ERROR_IS_OK(result)) {
DEBUG(0, ("nt_printer_remove: failed to remove rpinter %s",
printer));
diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c
index fff5051..e0ace23 100644
--- a/source3/printing/nt_printing_ads.c
+++ b/source3/printing/nt_printing_ads.c
@@ -30,7 +30,8 @@
/*****************************************************************
****************************************************************/
-static void store_printer_guid(const char *printer, struct GUID guid)
+static void store_printer_guid(struct messaging_context *msg_ctx,
+ const char *printer, struct GUID guid)
{
TALLOC_CTX *tmp_ctx;
struct auth_serversupplied_info *server_info = NULL;
@@ -68,7 +69,8 @@ static void store_printer_guid(const char *printer, struct GUID guid)
goto done;
}
- result = winreg_set_printer_dataex(tmp_ctx, server_info, printer,
+ result = winreg_set_printer_dataex(tmp_ctx, server_info, msg_ctx,
+ printer,
SPOOL_DSSPOOLER_KEY, "objectGUID",
REG_SZ, blob.data, blob.length);
if (!W_ERROR_IS_OK(result)) {
@@ -80,7 +82,8 @@ done:
talloc_free(tmp_ctx);
}
-static WERROR nt_printer_publish_ads(ADS_STRUCT *ads,
+static WERROR nt_printer_publish_ads(struct messaging_context *msg_ctx,
+ ADS_STRUCT *ads,
struct spoolss_PrinterInfo2 *pinfo2)
{
ADS_STATUS ads_rc;
@@ -186,7 +189,7 @@ static WERROR nt_printer_publish_ads(ADS_STRUCT *ads,
ZERO_STRUCT(guid);
ads_pull_guid(ads, res, &guid);
ads_msgfree(ads, res);
- store_printer_guid(printer, guid);
+ store_printer_guid(msg_ctx, printer, guid);
}
TALLOC_FREE(ctx);
@@ -234,6 +237,7 @@ static WERROR nt_printer_unpublish_ads(ADS_STRUCT *ads,
WERROR nt_printer_publish(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
struct spoolss_PrinterInfo2 *pinfo2,
int action)
{
@@ -263,7 +267,7 @@ WERROR nt_printer_publish(TALLOC_CTX *mem_ctx,
sinfo2->attributes = pinfo2->attributes;
- win_rc = winreg_update_printer(mem_ctx, server_info,
+ win_rc = winreg_update_printer(mem_ctx, server_info, msg_ctx,
pinfo2->sharename, info2_mask,
sinfo2, NULL, NULL);
if (!W_ERROR_IS_OK(win_rc)) {
@@ -295,7 +299,7 @@ WERROR nt_printer_publish(TALLOC_CTX *mem_ctx,
switch (action) {
case DSPRINT_PUBLISH:
case DSPRINT_UPDATE:
- win_rc = nt_printer_publish_ads(ads, pinfo2);
+ win_rc = nt_printer_publish_ads(msg_ctx, ads, pinfo2);
break;
case DSPRINT_UNPUBLISH:
win_rc = nt_printer_unpublish_ads(ads, pinfo2->sharename);
@@ -307,7 +311,7 @@ done:
return win_rc;
}
-WERROR check_published_printers(void)
+WERROR check_published_printers(struct messaging_context *msg_ctx)
{
ADS_STATUS ads_rc;
ADS_STRUCT *ads = NULL;
@@ -353,14 +357,15 @@ WERROR check_published_printers(void)
continue;
}
- result = winreg_get_printer(tmp_ctx, server_info, NULL,
- lp_servicename(snum), &pinfo2);
+ result = winreg_get_printer(tmp_ctx, server_info, msg_ctx,
+ NULL, lp_servicename(snum),
+ &pinfo2);
if (!W_ERROR_IS_OK(result)) {
continue;
}
if (pinfo2->attributes & PRINTER_ATTRIBUTE_PUBLISHED) {
- nt_printer_publish_ads(ads, pinfo2);
+ nt_printer_publish_ads(msg_ctx, ads, pinfo2);
}
TALLOC_FREE(pinfo2);
@@ -376,6 +381,7 @@ done:
bool is_printer_published(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
char *servername, char *printer, struct GUID *guid,
struct spoolss_PrinterInfo2 **info2)
{
@@ -386,7 +392,7 @@ bool is_printer_published(TALLOC_CTX *mem_ctx,
WERROR result;
NTSTATUS status;
- result = winreg_get_printer(mem_ctx, server_info,
+ result = winreg_get_printer(mem_ctx, server_info, msg_ctx,
servername, printer, &pinfo2);
if (!W_ERROR_IS_OK(result)) {
return false;
@@ -403,7 +409,8 @@ bool is_printer_published(TALLOC_CTX *mem_ctx,
/* fetching printer guids really ought to be a separate function. */
- result = winreg_get_printer_dataex(mem_ctx, server_info, printer,
+ result = winreg_get_printer_dataex(mem_ctx, server_info, msg_ctx,
+ printer,
SPOOL_DSSPOOLER_KEY, "objectGUID",
&type, &data, &data_size);
if (!W_ERROR_IS_OK(result)) {
diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c
index 7e7db56..7b37926 100644
--- a/source3/printing/nt_printing_migrate.c
+++ b/source3/printing/nt_printing_migrate.c
@@ -585,7 +585,7 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx,
return NT_STATUS_OK;
}
-bool nt_printing_tdb_migrate(void)
+bool nt_printing_tdb_migrate(struct messaging_context *msg_ctx)
{
const char *drivers_path = state_path("ntdrivers.tdb");
const char *printers_path = state_path("ntprinters.tdb");
@@ -613,6 +613,7 @@ bool nt_printing_tdb_migrate(void)
status = rpc_pipe_open_internal(tmp_ctx,
&ndr_table_spoolss.syntax_id,
server_info,
+ msg_ctx,
&spoolss_pipe);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("Couldn't open internal spoolss pipe: %s\n",
diff --git a/source3/printing/nt_printing_migrate.h b/source3/printing/nt_printing_migrate.h
index fcaeb61..9ab2fa7 100644
--- a/source3/printing/nt_printing_migrate.h
+++ b/source3/printing/nt_printing_migrate.h
@@ -21,6 +21,6 @@
#ifndef _NT_PRINTING_MIGRATE_H_
#define _NT_PRINTING_MIGRATE_H_
-bool nt_printing_tdb_migrate(void);
+bool nt_printing_tdb_migrate(struct messaging_context *msg_ctx);
#endif /* _NT_PRINTING_MIGRATE_H_ */
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 0412d75..9d98d5d 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -2112,6 +2112,7 @@ static bool is_owner(struct auth_serversupplied_info *server_info,
****************************************************************************/
WERROR print_job_delete(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
int snum, uint32_t jobid)
{
const char* sharename = lp_const_servicename(snum);
@@ -2125,7 +2126,8 @@ WERROR print_job_delete(struct auth_serversupplied_info *server_info,
owns their job. */
if (!owner &&
- !print_access_check(server_info, snum, JOB_ACCESS_ADMINISTER)) {
+ !print_access_check(server_info, msg_ctx, snum,
+ JOB_ACCESS_ADMINISTER)) {
DEBUG(3, ("delete denied by security descriptor\n"));
/* BEGIN_ADMIN_LOG */
@@ -2177,8 +2179,9 @@ pause, or resume print job. User name: %s. Printer name: %s.",
Pause a job.
****************************************************************************/
-bool print_job_pause(struct auth_serversupplied_info *server_info, int snum,
- uint32 jobid, WERROR *errcode)
+bool print_job_pause(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
+ int snum, uint32 jobid, WERROR *errcode)
{
const char* sharename = lp_const_servicename(snum);
struct printjob *pjob;
@@ -2200,7 +2203,8 @@ bool print_job_pause(struct auth_serversupplied_info *server_info, int snum,
}
if (!is_owner(server_info, lp_const_servicename(snum), jobid) &&
- !print_access_check(server_info, snum, JOB_ACCESS_ADMINISTER)) {
+ !print_access_check(server_info, msg_ctx, snum,
+ JOB_ACCESS_ADMINISTER)) {
DEBUG(3, ("pause denied by security descriptor\n"));
/* BEGIN_ADMIN_LOG */
@@ -2239,8 +2243,9 @@ pause, or resume print job. User name: %s. Printer name: %s.",
Resume a job.
****************************************************************************/
-bool print_job_resume(struct auth_serversupplied_info *server_info, int snum,
- uint32 jobid, WERROR *errcode)
+bool print_job_resume(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
+ int snum, uint32 jobid, WERROR *errcode)
{
const char *sharename = lp_const_servicename(snum);
struct printjob *pjob;
@@ -2262,7 +2267,8 @@ bool print_job_resume(struct auth_serversupplied_info *server_info, int snum,
}
if (!is_owner(server_info, lp_const_servicename(snum), jobid) &&
- !print_access_check(server_info, snum, JOB_ACCESS_ADMINISTER)) {
+ !print_access_check(server_info, msg_ctx, snum,
+ JOB_ACCESS_ADMINISTER)) {
DEBUG(3, ("resume denied by security descriptor\n"));
*errcode = WERR_ACCESS_DENIED;
@@ -2502,6 +2508,7 @@ static bool add_to_jobs_changed(struct tdb_print_db *pdb, uint32 jobid)
***************************************************************************/
static WERROR print_job_checks(struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
int snum, int *njobs)
{
const char *sharename = lp_const_servicename(snum);
@@ -2509,13 +2516,14 @@ static WERROR print_job_checks(struct auth_serversupplied_info *server_info,
uint64_t minspace;
int ret;
- if (!print_access_check(server_info, snum, PRINTER_ACCESS_USE)) {
+ if (!print_access_check(server_info, msg_ctx, snum,
--
Samba Shared Repository
More information about the samba-cvs
mailing list