s3-spoolss: remove old spoolss_OpenPrinter.
authorGünther Deschner <gd@samba.org>
Tue, 10 Feb 2009 00:58:46 +0000 (01:58 +0100)
committerGünther Deschner <gd@samba.org>
Tue, 10 Feb 2009 10:27:04 +0000 (11:27 +0100)
Guenther

source3/include/proto.h
source3/include/rpc_spoolss.h
source3/rpc_parse/parse_spoolss.c

index d5ef65e..c2391c7 100644 (file)
@@ -5805,8 +5805,6 @@ bool make_spoolss_printer_info_3(TALLOC_CTX *mem_ctx, SPOOL_PRINTER_INFO_LEVEL_3
                                PRINTER_INFO_3 *info);
 bool make_spoolss_printer_info_7(TALLOC_CTX *mem_ctx, SPOOL_PRINTER_INFO_LEVEL_7 **spool_info7, 
                                PRINTER_INFO_7 *info);
-bool spoolss_io_q_open_printer(const char *desc, SPOOL_Q_OPEN_PRINTER *q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_open_printer(const char *desc, SPOOL_R_OPEN_PRINTER *r_u, prs_struct *ps, int depth);
 bool make_spoolss_q_getprinterdata(SPOOL_Q_GETPRINTERDATA *q_u,
                                   const POLICY_HND *handle,
                                   const char *valuename, uint32 size);
@@ -6151,7 +6149,6 @@ void reset_all_printerdata(struct messaging_context *msg,
                           uint32_t msg_type,
                           struct server_id server_id,
                           DATA_BLOB *data);
-WERROR _spoolss_open_printer(pipes_struct *p, SPOOL_Q_OPEN_PRINTER *q_u, SPOOL_R_OPEN_PRINTER *r_u);
 bool convert_devicemode(const char *printername, const DEVICEMODE *devmode,
                                NT_DEVICEMODE **pp_nt_devmode);
 WERROR set_printer_dataex( NT_PRINTER_INFO_LEVEL *printer, const char *key, const char *value,
index 225836c..05b4858 100644 (file)
@@ -394,18 +394,6 @@ PRINTER_DEFAULT;
 
 /********************************************/
 
-typedef struct {
-       UNISTR2 *printername;
-       PRINTER_DEFAULT printer_default;
-} SPOOL_Q_OPEN_PRINTER;
-
-typedef struct {
-       POLICY_HND handle;      /* handle used along all transactions (20*uint8) */
-       WERROR status;
-} SPOOL_R_OPEN_PRINTER;
-
-/********************************************/
-
 typedef struct spool_notify_option_type
 {
        uint16 type;
index 3af7263..af2378b 100644 (file)
@@ -925,62 +925,6 @@ bool make_spoolss_printer_info_7(TALLOC_CTX *mem_ctx, SPOOL_PRINTER_INFO_LEVEL_7
        return True;
 }
 
-
-/*******************************************************************
- * read a structure.
- * called from spoolss_q_open_printer_ex (srv_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_q_open_printer(const char *desc, SPOOL_Q_OPEN_PRINTER *q_u, prs_struct *ps, int depth)
-{
-       if (q_u == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "spoolss_io_q_open_printer");
-       depth++;
-
-       if (!prs_align(ps))
-               return False;
-
-       if (!prs_io_unistr2_p("ptr", ps, depth, &q_u->printername))
-               return False;
-       if (!prs_io_unistr2("printername", ps, depth, q_u->printername))
-               return False;
-       
-       if (!prs_align(ps))
-               return False;
-
-       if (!spoolss_io_printer_default("", &q_u->printer_default, ps, depth))
-               return False;
-               
-       return True;
-}
-
-/*******************************************************************
- * write a structure.
- * called from static spoolss_r_open_printer_ex (srv_spoolss.c)
- * called from spoolss_open_printer_ex (cli_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_r_open_printer(const char *desc, SPOOL_R_OPEN_PRINTER *r_u, prs_struct *ps, int depth)
-{
-       if (r_u == NULL) return False;
-
-       prs_debug(ps, depth, desc, "spoolss_io_r_open_printer");
-       depth++;
-       
-       if (!prs_align(ps))
-               return False;
-
-       if (!smb_io_pol_hnd("printer handle",&(r_u->handle),ps,depth))
-               return False;   
-
-       if (!prs_werror("status", ps, depth, &(r_u->status)))
-               return False;
-               
-       return True;
-}
-
 /*******************************************************************
  * make a structure.
  ********************************************************************/