s3-spoolss: remove old spoolss_DeletePrinterDriver.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 023bbd7e424b5abdb9c29b05b3e8cf79dbfab274..57f943b8467effcdf8911c64d569b27e1c10e71d 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5461,9 +5461,6 @@ WERROR rpccli_spoolss_addprinterex (struct rpc_pipe_client *cli, TALLOC_CTX *mem
 WERROR rpccli_spoolss_deleteprinterdriverex(struct rpc_pipe_client *cli, 
                                          TALLOC_CTX *mem_ctx, const char *arch,
                                          const char *driver, int version);
-WERROR rpccli_spoolss_deleteprinterdriver (struct rpc_pipe_client *cli, 
-                                       TALLOC_CTX *mem_ctx, const char *arch,
-                                       const char *driver);
 WERROR rpccli_spoolss_getprintprocessordirectory(struct rpc_pipe_client *cli,
                                              TALLOC_CTX *mem_ctx,
                                              char *name, char *environment,
@@ -5834,13 +5831,6 @@ bool make_spoolss_q_deleteprinterdriverex( TALLOC_CTX *mem_ctx,
                                            const char* arch, 
                                            const char* driver,
                                            int version);
-bool make_spoolss_q_deleteprinterdriver(
-       TALLOC_CTX *mem_ctx,
-       SPOOL_Q_DELETEPRINTERDRIVER *q_u, 
-       const char *server,
-       const char* arch, 
-       const char* driver 
-);
 bool make_spoolss_q_getprinterdata(SPOOL_Q_GETPRINTERDATA *q_u,
                                   const POLICY_HND *handle,
                                   const char *valuename, uint32 size);
@@ -5850,8 +5840,6 @@ bool make_spoolss_q_getprinterdataex(SPOOL_Q_GETPRINTERDATAEX *q_u,
                                     const char *valuename, uint32 size);
 bool spoolss_io_q_getprinterdata(const char *desc, SPOOL_Q_GETPRINTERDATA *q_u, prs_struct *ps, int depth);
 bool spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA *r_u, prs_struct *ps, int depth);
-bool spoolss_io_q_deleteprinterdriver(const char *desc, SPOOL_Q_DELETEPRINTERDRIVER *q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_deleteprinterdriver(const char *desc, SPOOL_R_DELETEPRINTERDRIVER *r_u, prs_struct *ps, int depth);
 bool spoolss_io_q_deleteprinterdriverex(const char *desc, SPOOL_Q_DELETEPRINTERDRIVEREX *q_u, prs_struct *ps, int depth);
 bool spoolss_io_r_deleteprinterdriverex(const char *desc, SPOOL_R_DELETEPRINTERDRIVEREX *r_u, prs_struct *ps, int depth);
 bool spoolss_io_q_startdocprinter(const char *desc, SPOOL_Q_STARTDOCPRINTER *q_u, prs_struct *ps, int depth);
@@ -6218,7 +6206,6 @@ WERROR _spoolss_open_printer(pipes_struct *p, SPOOL_Q_OPEN_PRINTER *q_u, SPOOL_R
 WERROR _spoolss_open_printer_ex( pipes_struct *p, SPOOL_Q_OPEN_PRINTER_EX *q_u, SPOOL_R_OPEN_PRINTER_EX *r_u);
 bool convert_devicemode(const char *printername, const DEVICEMODE *devmode,
                                NT_DEVICEMODE **pp_nt_devmode);
-WERROR _spoolss_deleteprinterdriver(pipes_struct *p, SPOOL_Q_DELETEPRINTERDRIVER *q_u, SPOOL_R_DELETEPRINTERDRIVER *r_u);
 WERROR _spoolss_deleteprinterdriverex(pipes_struct *p, SPOOL_Q_DELETEPRINTERDRIVEREX *q_u, SPOOL_R_DELETEPRINTERDRIVEREX *r_u);
 WERROR set_printer_dataex( NT_PRINTER_INFO_LEVEL *printer, const char *key, const char *value,
                                   uint32 type, uint8 *data, int real_len  );

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index c07256812dba2dad086f4e15e1311e7b2b5f8645..695bb6a7110ecf3a6bc7602150a832382067c219 100644 (file)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -526,21 +526,6 @@ typedef struct spool_r_getprinterdata
 }
 SPOOL_R_GETPRINTERDATA;
 
-typedef struct spool_q_deleteprinterdriver
-{
-       uint32 server_ptr;
-       UNISTR2 server;
-       UNISTR2 arch;
-       UNISTR2 driver;
-}
-SPOOL_Q_DELETEPRINTERDRIVER;
-
-typedef struct spool_r_deleteprinterdriver
-{
-       WERROR status;
-}
-SPOOL_R_DELETEPRINTERDRIVER;
-
 typedef struct spool_q_deleteprinterdriverex
 {
        uint32 server_ptr;

diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index a0fb10bda2118f3a730aa9d54ef8f1eb959b0da8..3b2c3970dae0489bd3f80a85f249777634e52db0 100644 (file)
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -1066,36 +1066,6 @@ WERROR rpccli_spoolss_deleteprinterdriverex(struct rpc_pipe_client *cli,
 /**********************************************************************
 **********************************************************************/
 
-WERROR rpccli_spoolss_deleteprinterdriver (struct rpc_pipe_client *cli, 
-                                       TALLOC_CTX *mem_ctx, const char *arch,
-                                       const char *driver)
-{
-       prs_struct qbuf, rbuf;
-       SPOOL_Q_DELETEPRINTERDRIVER in;
-        SPOOL_R_DELETEPRINTERDRIVER out;
-       fstring server;
-
-       ZERO_STRUCT(in);
-       ZERO_STRUCT(out);
-
-        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-        strupper_m(server);
-
-       make_spoolss_q_deleteprinterdriver( mem_ctx, &in, server, arch, driver );
-
-       CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_DELETEPRINTERDRIVER,
-                   in, out, 
-                   qbuf, rbuf,
-                   spoolss_io_q_deleteprinterdriver,
-                   spoolss_io_r_deleteprinterdriver, 
-                   WERR_GENERAL_FAILURE );
-                   
-       return out.status;      
-}
-
-/**********************************************************************
-**********************************************************************/
-
 WERROR rpccli_spoolss_getprintprocessordirectory(struct rpc_pipe_client *cli,
                                              TALLOC_CTX *mem_ctx,
                                              char *name, char *environment,

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 1c55c2b037f0ea2e464af4a6d9f8a8513bffbe2b..394bf009c1c6e6c34d4cd009bd3280e0756a9daf 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1261,30 +1261,6 @@ bool make_spoolss_q_deleteprinterdriverex( TALLOC_CTX *mem_ctx,
 }
 
 
-/*******************************************************************
- * init a structure.
- ********************************************************************/
-bool make_spoolss_q_deleteprinterdriver(
-       TALLOC_CTX *mem_ctx,
-       SPOOL_Q_DELETEPRINTERDRIVER *q_u, 
-       const char *server,
-       const char* arch, 
-       const char* driver 
-)
-{
-       DEBUG(5,("make_spoolss_q_deleteprinterdriver\n"));
-       
-       q_u->server_ptr = (server!=NULL)?1:0;
-
-       /* these must be NULL terminated or else NT4 will
-          complain about invalid parameters --jerry */
-       init_unistr2(&q_u->server, server, UNI_STR_TERMINATE);
-       init_unistr2(&q_u->arch, arch, UNI_STR_TERMINATE);
-       init_unistr2(&q_u->driver, driver, UNI_STR_TERMINATE);
-       
-       return True;
-}
-
 /*******************************************************************
  * make a structure.
  ********************************************************************/
@@ -1394,56 +1370,6 @@ bool spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA *r_u,
        return True;
 }
 
-/*******************************************************************
- * read a structure.
- * called from api_spoolss_deleteprinterdriver (srv_spoolss.c)
- * called from spoolss_deleteprinterdriver (cli_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_q_deleteprinterdriver(const char *desc, SPOOL_Q_DELETEPRINTERDRIVER *q_u, prs_struct *ps, int depth)
-{
-       if (q_u == NULL) return False;
-
-       prs_debug(ps, depth, desc, "spoolss_io_q_deleteprinterdriver");
-       depth++;
-
-       if (!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("server_ptr", ps, depth, &q_u->server_ptr))
-               return False;           
-       if(!smb_io_unistr2("server", &q_u->server, q_u->server_ptr, ps, depth))
-               return False;
-       if(!smb_io_unistr2("arch", &q_u->arch, True, ps, depth))
-               return False;
-       if(!smb_io_unistr2("driver", &q_u->driver, True, ps, depth))
-               return False;
-
-
-       return True;
-}
-
-
-/*******************************************************************
- * write a structure.
- ********************************************************************/
-bool spoolss_io_r_deleteprinterdriver(const char *desc, SPOOL_R_DELETEPRINTERDRIVER *r_u, prs_struct *ps, int depth)
-{
-       if (r_u == NULL) return False;
-
-       prs_debug(ps, depth, desc, "spoolss_io_r_deleteprinterdriver");
-       depth++;
-
-       if (!prs_align(ps))
-               return False;
-
-       if (!prs_werror("status", ps, depth, &r_u->status))
-               return False;
-
-       return True;
-}
-
-
 /*******************************************************************
  * read a structure.
  * called from api_spoolss_deleteprinterdriver (srv_spoolss.c)