The branch, master has been updated
via d78fd1954714cbd033247668bad80a92bbd048e1 (commit)
via 41c01930a3807cf45690d63f55c37d4f9db20d5a (commit)
from dfa559145c0cbee1f2acdf2c401125e75ca52922 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d78fd1954714cbd033247668bad80a92bbd048e1
Author: Günther Deschner <[email protected]>
Date: Mon Feb 9 13:03:23 2009 +0100
s3-spoolss: remove old _spoolss_FindClosePrinterNotify.
Guenther
commit 41c01930a3807cf45690d63f55c37d4f9db20d5a
Author: Günther Deschner <[email protected]>
Date: Mon Feb 9 13:03:07 2009 +0100
s3-spoolss: use pidl for _spoolss_FindClosePrinterNotify.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/include/proto.h | 3 --
source3/include/rpc_spoolss.h | 14 -------------
source3/rpc_parse/parse_spoolss.c | 36 -----------------------------------
source3/rpc_server/srv_spoolss.c | 22 +--------------------
source3/rpc_server/srv_spoolss_nt.c | 24 +++++++---------------
5 files changed, 9 insertions(+), 90 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index f8e62a8..5009e6d 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5922,8 +5922,6 @@ bool make_spoolss_q_setprinter(TALLOC_CTX *mem_ctx,
SPOOL_Q_SETPRINTER *q_u,
uint32 command);
bool spoolss_io_r_setprinter(const char *desc, SPOOL_R_SETPRINTER *r_u,
prs_struct *ps, int depth);
bool spoolss_io_q_setprinter(const char *desc, SPOOL_Q_SETPRINTER *q_u,
prs_struct *ps, int depth);
-bool spoolss_io_r_fcpn(const char *desc, SPOOL_R_FCPN *r_u, prs_struct *ps,
int depth);
-bool spoolss_io_q_fcpn(const char *desc, SPOOL_Q_FCPN *q_u, prs_struct *ps,
int depth);
bool spoolss_io_r_addjob(const char *desc, SPOOL_R_ADDJOB *r_u, prs_struct
*ps, int depth);
bool spoolss_io_q_addjob(const char *desc, SPOOL_Q_ADDJOB *q_u, prs_struct
*ps, int depth);
bool spoolss_io_r_enumjobs(const char *desc, SPOOL_R_ENUMJOBS *r_u, prs_struct
*ps, int depth);
@@ -6274,7 +6272,6 @@ WERROR _spoolss_startdocprinter(pipes_struct *p,
SPOOL_Q_STARTDOCPRINTER *q_u, S
WERROR add_port_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, const char
*portname, const char *uri );
bool add_printer_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token,
NT_PRINTER_INFO_LEVEL *printer);
WERROR _spoolss_setprinter(pipes_struct *p, SPOOL_Q_SETPRINTER *q_u,
SPOOL_R_SETPRINTER *r_u);
-WERROR _spoolss_fcpn(pipes_struct *p, SPOOL_Q_FCPN *q_u, SPOOL_R_FCPN *r_u);
WERROR _spoolss_addjob(pipes_struct *p, SPOOL_Q_ADDJOB *q_u, SPOOL_R_ADDJOB
*r_u);
WERROR _spoolss_enumjobs( pipes_struct *p, SPOOL_Q_ENUMJOBS *q_u,
SPOOL_R_ENUMJOBS *r_u);
WERROR _spoolss_schedulejob( pipes_struct *p, SPOOL_Q_SCHEDULEJOB *q_u,
SPOOL_R_SCHEDULEJOB *r_u);
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index e6462bc..9742117 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -645,20 +645,6 @@ typedef struct spool_r_rfnpcnex
}
SPOOL_R_RFNPCNEX;
-/* Find Close Printer Notify */
-typedef struct spool_q_fcpn
-{
- POLICY_HND handle;
-}
-SPOOL_Q_FCPN;
-
-typedef struct spool_r_fcpn
-{
- WERROR status;
-}
-SPOOL_R_FCPN;
-
-
typedef struct printer_info_0
{
UNISTR printername;
diff --git a/source3/rpc_parse/parse_spoolss.c
b/source3/rpc_parse/parse_spoolss.c
index b9bee6d..84b764e 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -3449,42 +3449,6 @@ bool spoolss_io_q_setprinter(const char *desc,
SPOOL_Q_SETPRINTER *q_u, prs_stru
/*******************************************************************
********************************************************************/
-bool spoolss_io_r_fcpn(const char *desc, SPOOL_R_FCPN *r_u, prs_struct *ps,
int depth)
-{
- prs_debug(ps, depth, desc, "spoolss_io_r_fcpn");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_werror("status", ps, depth, &r_u->status))
- return False;
-
- return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool spoolss_io_q_fcpn(const char *desc, SPOOL_Q_FCPN *q_u, prs_struct *ps,
int depth)
-{
-
- prs_debug(ps, depth, desc, "spoolss_io_q_fcpn");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
- return False;
-
- return True;
-}
-
-
-/*******************************************************************
-********************************************************************/
-
bool spoolss_io_r_addjob(const char *desc, SPOOL_R_ADDJOB *r_u, prs_struct
*ps, int depth)
{
prs_debug(ps, depth, desc, "");
diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index 732d127..bf11bc6 100644
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -459,27 +459,7 @@ static bool api_spoolss_setprinter(pipes_struct *p)
static bool api_spoolss_fcpn(pipes_struct *p)
{
- SPOOL_Q_FCPN q_u;
- SPOOL_R_FCPN r_u;
- prs_struct *data = &p->in_data.data;
- prs_struct *rdata = &p->out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- if(!spoolss_io_q_fcpn("", &q_u, data, 0)) {
- DEBUG(0,("spoolss_io_q_fcpn: unable to unmarshall
SPOOL_Q_FCPN.\n"));
- return False;
- }
-
- r_u.status = _spoolss_fcpn(p, &q_u, &r_u);
-
- if(!spoolss_io_r_fcpn("",&r_u,rdata,0)) {
- DEBUG(0,("spoolss_io_r_fcpn: unable to marshall
SPOOL_R_FCPN.\n"));
- return False;
- }
-
- return True;
+ return proxy_spoolss_call(p, NDR_SPOOLSS_FINDCLOSEPRINTERNOTIFY);
}
/****************************************************************************
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 3a166ce..03ef668 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6572,16 +6572,19 @@ WERROR _spoolss_setprinter(pipes_struct *p,
SPOOL_Q_SETPRINTER *q_u, SPOOL_R_SET
}
}
-/****************************************************************************
-****************************************************************************/
+/****************************************************************
+ _spoolss_FindClosePrinterNotify
+****************************************************************/
-WERROR _spoolss_fcpn(pipes_struct *p, SPOOL_Q_FCPN *q_u, SPOOL_R_FCPN *r_u)
+WERROR _spoolss_FindClosePrinterNotify(pipes_struct *p,
+ struct spoolss_FindClosePrinterNotify *r)
{
- POLICY_HND *handle = &q_u->handle;
+ POLICY_HND *handle = r->in.handle;
Printer_entry *Printer= find_printer_index_by_hnd(p, handle);
if (!Printer) {
- DEBUG(2,("_spoolss_fcpn: Invalid handle (%s:%u:%u)\n",
OUR_HANDLE(handle)));
+ DEBUG(2,("_spoolss_FindClosePrinterNotify: "
+ "Invalid handle (%s:%u:%u)\n", OUR_HANDLE(handle)));
return WERR_BADFID;
}
@@ -10460,17 +10463,6 @@ WERROR
_spoolss_FindNextPrinterChangeNotification(pipes_struct *p,
}
/****************************************************************
- _spoolss_FindClosePrinterNotify
-****************************************************************/
-
-WERROR _spoolss_FindClosePrinterNotify(pipes_struct *p,
- struct spoolss_FindClosePrinterNotify *r)
-{
- p->rng_fault_state = true;
- return WERR_NOT_SUPPORTED;
-}
-
-/****************************************************************
_spoolss_RouterFindFirstPrinterChangeNotificationOld
****************************************************************/
--
Samba Shared Repository
