From bd7595ec37ab9c2d4290893a99e99856dca0c5cb Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 14 Sep 2001 15:22:49 +0000 Subject: merge from appliance_head (This used to be commit f70b1707e42b3f7aaa38cc5637fcc5cbcdd5a26a) --- source3/rpc_server/srv_spoolss_nt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index cffdfb0ff9..5fed46deec 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -6148,12 +6148,6 @@ WERROR _spoolss_setprinterdata( pipes_struct *p, SPOOL_Q_SETPRINTERDATA *q_u, SP if (!get_printer_snum(p,handle, &snum)) return WERR_BADFID; - status = get_a_printer(&printer, 2, lp_servicename(snum)); - if (!W_ERROR_IS_OK(status)) - return status; - - convert_specific_param(¶m, value , type, data, real_len); - ZERO_STRUCT(old_param); /* @@ -6177,6 +6171,12 @@ WERROR _spoolss_setprinterdata( pipes_struct *p, SPOOL_Q_SETPRINTERDATA *q_u, SP has been left in as an optimization to keep from from writing to disk as often --jerry */ + status = get_a_printer(&printer, 2, lp_servicename(snum)); + if (!W_ERROR_IS_OK(status)) + return status; + + convert_specific_param(¶m, value , type, data, real_len); + if (get_specific_param(*printer, 2, param->value, &old_param.data, &old_param.type, (uint32 *)&old_param.data_len)) { -- cgit