From 1c42bc3ad48c9019a62f556ff2841df5f5f832d9 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 9 Sep 2010 11:21:43 +0200 Subject: s3-spoolss: Make auth_serversupplied_info const. --- source3/rpc_server/srv_spoolss_nt.c | 34 ++++++++++++------------- source3/rpc_server/srv_spoolss_util.c | 48 +++++++++++++++++------------------ source3/rpc_server/srv_spoolss_util.h | 44 ++++++++++++++++---------------- 3 files changed, 63 insertions(+), 63 deletions(-) (limited to 'source3/rpc_server') diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index b4f960d0bc..8a81d62c9a 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -473,7 +473,7 @@ static void prune_printername_cache(void) ****************************************************************************/ static bool set_printer_hnd_name(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, Printer_entry *Printer, const char *handlename) @@ -3563,7 +3563,7 @@ done: ********************************************************************/ static WERROR construct_printer_info0(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, struct spoolss_PrinterInfo2 *info2, struct spoolss_PrinterInfo0 *r, @@ -3907,7 +3907,7 @@ static bool snum_is_shared_printer(int snum) ********************************************************************/ static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, uint32_t level, uint32_t flags, @@ -4014,7 +4014,7 @@ static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enumprinters_level0(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, uint32_t flags, const char *servername, @@ -4032,7 +4032,7 @@ static WERROR enumprinters_level0(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enum_all_printers_info_1(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, uint32_t flags, union spoolss_PrinterInfo **info, @@ -4049,7 +4049,7 @@ static WERROR enum_all_printers_info_1(TALLOC_CTX *mem_ctx, *********************************************************************/ static WERROR enum_all_printers_info_1_local(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, union spoolss_PrinterInfo **info, uint32_t *count) @@ -4065,7 +4065,7 @@ static WERROR enum_all_printers_info_1_local(TALLOC_CTX *mem_ctx, *********************************************************************/ static WERROR enum_all_printers_info_1_name(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *name, union spoolss_PrinterInfo **info, @@ -4092,7 +4092,7 @@ static WERROR enum_all_printers_info_1_name(TALLOC_CTX *mem_ctx, *********************************************************************/ static WERROR enum_all_printers_info_1_network(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *name, union spoolss_PrinterInfo **info, @@ -4129,7 +4129,7 @@ static WERROR enum_all_printers_info_1_network(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enum_all_printers_info_2(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, union spoolss_PrinterInfo **info, uint32_t *count) @@ -4145,7 +4145,7 @@ static WERROR enum_all_printers_info_2(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enumprinters_level1(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, uint32_t flags, const char *name, @@ -4179,7 +4179,7 @@ static WERROR enumprinters_level1(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, uint32_t flags, const char *servername, @@ -4212,7 +4212,7 @@ static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enumprinters_level4(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, uint32_t flags, const char *servername, @@ -4231,7 +4231,7 @@ static WERROR enumprinters_level4(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR enumprinters_level5(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, uint32_t flags, const char *servername, @@ -5107,7 +5107,7 @@ static WERROR fill_printer_driver_info101(TALLOC_CTX *mem_ctx, ********************************************************************/ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, uint32_t level, union spoolss_DriverInfo *r, @@ -5810,7 +5810,7 @@ static bool add_printer_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, } static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, int snum, struct spoolss_SetPrinterInfo2 *printer, @@ -6858,7 +6858,7 @@ WERROR _spoolss_SetJob(struct pipes_struct *p, ****************************************************************************/ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *servername, const char *architecture, @@ -6976,7 +6976,7 @@ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx, ****************************************************************************/ static WERROR enumprinterdrivers_level(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *servername, const char *architecture, diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index 81790124a2..78a332588c 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -242,7 +242,7 @@ static uint32_t winreg_printer_rev_changeid(void) * code if something gone wrong. */ static WERROR winreg_printer_openkey(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, struct dcerpc_binding_handle **winreg_binding_handle, const char *path, @@ -1089,7 +1089,7 @@ static WERROR winreg_printer_write_multi_sz(TALLOC_CTX *mem_ctx, } static WERROR winreg_printer_opendriver(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *drivername, const char *architecture, @@ -1336,7 +1336,7 @@ static WERROR winreg_printer_ver_to_dword(const char *str, uint64_t *data) ********************************************************************/ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *servername, const char *sharename) @@ -1649,7 +1649,7 @@ done: } WERROR winreg_update_printer(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *sharename, uint32_t info2_mask, @@ -1983,7 +1983,7 @@ done: } WERROR winreg_get_printer(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *servername, const char *printer, @@ -2283,7 +2283,7 @@ done: } WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *sharename, struct spoolss_security_descriptor **psecdesc) @@ -2456,7 +2456,7 @@ done: } WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *sharename, const struct spoolss_security_descriptor *secdesc) @@ -2585,7 +2585,7 @@ done: /* Set printer data over the winreg pipe. */ WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -2668,7 +2668,7 @@ done: /* Get printer data over a winreg pipe. */ WERROR winreg_get_printer_dataex(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -2797,7 +2797,7 @@ done: /* Enumerate on the values of a given key and provide the data. */ WERROR winreg_enum_printer_dataex(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -2877,7 +2877,7 @@ done: /* Delete printer data over a winreg pipe. */ WERROR winreg_delete_printer_dataex(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -2953,7 +2953,7 @@ done: /* Enumerate on the subkeys of a given key and provide the data. */ WERROR winreg_enum_printer_key(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -3036,7 +3036,7 @@ done: /* Delete a key with subkeys of a given printer. */ WERROR winreg_delete_printer_key(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, const char *key) @@ -3127,7 +3127,7 @@ done: } WERROR winreg_printer_update_changeid(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer) { @@ -3195,7 +3195,7 @@ done: } WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, uint32_t *pchangeid) @@ -3278,7 +3278,7 @@ done: */ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, struct spoolss_AddFormInfo1 *form) { @@ -3378,7 +3378,7 @@ done: } WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, uint32_t *pnum_info, union spoolss_FormInfo **pinfo) @@ -3496,7 +3496,7 @@ done: } WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *form_name) { @@ -3578,7 +3578,7 @@ done: } WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *form_name, struct spoolss_AddFormInfo1 *form) @@ -3679,7 +3679,7 @@ done: } WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *form_name, struct spoolss_FormInfo1 *r) @@ -3815,7 +3815,7 @@ done: } WERROR winreg_add_driver(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, struct spoolss_AddDriverInfoCtr *r, const char **driver_name, @@ -4043,7 +4043,7 @@ done: } WERROR winreg_get_driver(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *architecture, const char *driver_name, @@ -4315,7 +4315,7 @@ done: } WERROR winreg_del_driver(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, struct spoolss_DriverInfo8 *info8, uint32_t version) @@ -4405,7 +4405,7 @@ done: } WERROR winreg_get_driver_list(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *architecture, uint32_t version, diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h index 2b8a653338..36581b84a5 100644 --- a/source3/rpc_server/srv_spoolss_util.h +++ b/source3/rpc_server/srv_spoolss_util.h @@ -72,7 +72,7 @@ enum spoolss_PrinterInfo2Mask { SPOOLSS_PRINTER_INFO_UNTILTIME WERROR winreg_create_printer(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *servername, const char *sharename); @@ -100,7 +100,7 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_update_printer(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *sharename, uint32_t info2_mask, @@ -126,7 +126,7 @@ WERROR winreg_update_printer(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *servername, const char *printer, @@ -147,7 +147,7 @@ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *sharename, struct spoolss_security_descriptor **psecdesc); @@ -167,7 +167,7 @@ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *sharename, const struct spoolss_security_descriptor *secdesc); @@ -197,7 +197,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -231,7 +231,7 @@ WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_get_printer_dataex(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -261,7 +261,7 @@ WERROR winreg_get_printer_dataex(TALLOC_CTX *mem_ctx, * code if something gone wrong. */ WERROR winreg_enum_printer_dataex(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -287,7 +287,7 @@ WERROR winreg_enum_printer_dataex(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_delete_printer_dataex(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -315,7 +315,7 @@ WERROR winreg_delete_printer_dataex(TALLOC_CTX *mem_ctx, * code if something gone wrong. */ WERROR winreg_enum_printer_key(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, const char *key, @@ -339,7 +339,7 @@ WERROR winreg_enum_printer_key(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_delete_printer_key(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, const char *key); @@ -363,7 +363,7 @@ WERROR winreg_delete_printer_key(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_printer_update_changeid(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer); @@ -382,7 +382,7 @@ WERROR winreg_printer_update_changeid(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *printer, uint32_t *pchangeid); @@ -405,7 +405,7 @@ WERROR winreg_printer_get_changeid(TALLOC_CTX *mem_ctx, * A corresponding DOS error is something went wrong. */ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, struct spoolss_AddFormInfo1 *form); @@ -424,7 +424,7 @@ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, uint32_t *pnum_info, union spoolss_FormInfo **pinfo); @@ -444,7 +444,7 @@ WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx, * A corresponding DOS error is something went wrong. */ WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *form_name); @@ -467,7 +467,7 @@ WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx, * A corresponding DOS error is something went wrong. */ WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *form_name, struct spoolss_AddFormInfo1 *form); @@ -487,7 +487,7 @@ WERROR winreg_printer_setform1(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *form_name, struct spoolss_FormInfo1 *form); @@ -509,7 +509,7 @@ WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx, * something went wrong. */ WERROR winreg_add_driver(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, struct spoolss_AddDriverInfoCtr *r, const char **driver_name, @@ -535,7 +535,7 @@ WERROR winreg_add_driver(TALLOC_CTX *mem_ctx, */ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *architecture, const char *driver_name, @@ -558,7 +558,7 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx, */ WERROR winreg_del_driver(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, struct spoolss_DriverInfo8 *info8, uint32_t version); @@ -584,7 +584,7 @@ WERROR winreg_del_driver(TALLOC_CTX *mem_ctx, */ WERROR winreg_get_driver_list(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, + const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, const char *architecture, uint32_t version, -- cgit