s3-spoolss: remove old spoolss_AddForm.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 600131db7716c0cbdc466231a8324543a45a829a..574dd49f594abbf9e72d6170040e6b1666d54d71 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5469,8 +5469,6 @@ WERROR rpccli_spoolss_getprintprocessordirectory(struct rpc_pipe_client *cli,
                                              TALLOC_CTX *mem_ctx,
                                              char *name, char *environment,
                                              fstring procdir);
-WERROR rpccli_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                          POLICY_HND *handle, uint32 level, FORM *form);
 WERROR rpccli_spoolss_setform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                           POLICY_HND *handle, uint32 level, 
                           const char *form_name, FORM *form);
@@ -6055,8 +6053,6 @@ bool spoolss_io_q_setprinterdata(const char *desc, SPOOL_Q_SETPRINTERDATA *q_u,
 bool spoolss_io_r_setprinterdata(const char *desc, SPOOL_R_SETPRINTERDATA *r_u, prs_struct *ps, int depth);
 bool spoolss_io_q_resetprinter(const char *desc, SPOOL_Q_RESETPRINTER *q_u, prs_struct *ps, int depth);
 bool spoolss_io_r_resetprinter(const char *desc, SPOOL_R_RESETPRINTER *r_u, prs_struct *ps, int depth);
-bool spoolss_io_q_addform(const char *desc, SPOOL_Q_ADDFORM *q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_addform(const char *desc, SPOOL_R_ADDFORM *r_u, prs_struct *ps, int depth);
 bool spoolss_io_q_setform(const char *desc, SPOOL_Q_SETFORM *q_u, prs_struct *ps, int depth);
 bool spoolss_io_r_setform(const char *desc, SPOOL_R_SETFORM *r_u, prs_struct *ps, int depth);
 bool spoolss_io_r_getjob(const char *desc, SPOOL_R_GETJOB *r_u, prs_struct *ps, int depth);
@@ -6105,8 +6101,6 @@ bool make_spoolss_q_getprintprocessordirectory(SPOOL_Q_GETPRINTPROCESSORDIRECTOR
 bool spoolss_io_q_getprintprocessordirectory(const char *desc, SPOOL_Q_GETPRINTPROCESSORDIRECTORY *q_u, prs_struct *ps, int depth);
 bool spoolss_io_r_getprintprocessordirectory(const char *desc, SPOOL_R_GETPRINTPROCESSORDIRECTORY *r_u, prs_struct *ps, int depth);
 bool smb_io_printprocessordirectory_1(const char *desc, RPC_BUFFER *buffer, PRINTPROCESSOR_DIRECTORY_1 *info, int depth);
-bool make_spoolss_q_addform(SPOOL_Q_ADDFORM *q_u, POLICY_HND *handle, 
-                           int level, FORM *form);
 bool make_spoolss_q_setform(SPOOL_Q_SETFORM *q_u, POLICY_HND *handle, 
                            int level, const char *form_name, FORM *form);
 bool make_spoolss_q_getform(SPOOL_Q_GETFORM *q_u, POLICY_HND *handle, 

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 665563532f420a1637cd7de281262aa0398e8134..016593529c031f0bb02aaa664d6811078c7549be 100644 (file)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -1708,21 +1708,6 @@ typedef struct _form
 }
 FORM;
 
-typedef struct spool_q_addform
-{
-       POLICY_HND handle;
-       uint32 level;
-       uint32 level2;          /* This should really be part of the FORM structure */
-       FORM form;
-}
-SPOOL_Q_ADDFORM;
-
-typedef struct spool_r_addform
-{
-       WERROR status;
-}
-SPOOL_R_ADDFORM;
-
 typedef struct spool_q_setform
 {
        POLICY_HND handle;

diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index bdb48a42542bcce62f7a1a718ccf28a680b27a14..6baa4f778dcf7275ec8abfd42a713e4761123afe 100644 (file)
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -1154,31 +1154,6 @@ WERROR rpccli_spoolss_getprintprocessordirectory(struct rpc_pipe_client *cli,
 /**********************************************************************
 **********************************************************************/
 
-WERROR rpccli_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                          POLICY_HND *handle, uint32 level, FORM *form)
-{
-       prs_struct qbuf, rbuf;
-       SPOOL_Q_ADDFORM in;
-       SPOOL_R_ADDFORM out;
-
-       ZERO_STRUCT(in);
-       ZERO_STRUCT(out);
-
-        make_spoolss_q_addform( &in, handle, level, form );
-       
-       CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_ADDFORM,
-                   in, out, 
-                   qbuf, rbuf,
-                   spoolss_io_q_addform,
-                   spoolss_io_r_addform, 
-                   WERR_GENERAL_FAILURE );
-
-       return out.status;
-}
-
-/**********************************************************************
-**********************************************************************/
-
 WERROR rpccli_spoolss_setform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                           POLICY_HND *handle, uint32 level, 
                           const char *form_name, FORM *form)

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 815b1b62e6912fd00bde2bc2d2be06b746d5a539..c8b58fd62d9af258202940e0c10e0ef5903b2b8c 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -5821,51 +5821,6 @@ static bool spoolss_io_addform(const char *desc, FORM *f, uint32 ptr, prs_struct
 /*******************************************************************
 ********************************************************************/  
 
-bool spoolss_io_q_addform(const char *desc, SPOOL_Q_ADDFORM *q_u, prs_struct *ps, int depth)
-{
-       uint32 useless_ptr=1;
-       prs_debug(ps, depth, desc, "spoolss_io_q_addform");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-       if(!smb_io_pol_hnd("printer handle", &q_u->handle, ps, depth))
-               return False;
-       if(!prs_uint32("level",  ps, depth, &q_u->level))
-               return False;
-       if(!prs_uint32("level2", ps, depth, &q_u->level2))
-               return False;
-
-       if (q_u->level==1)
-       {
-               if(!prs_uint32("useless_ptr", ps, depth, &useless_ptr))
-                       return False;
-               if(!spoolss_io_addform("", &q_u->form, useless_ptr, ps, depth))
-                       return False;
-       }
-
-       return True;
-}
-
-/*******************************************************************
-********************************************************************/  
-
-bool spoolss_io_r_addform(const char *desc, SPOOL_R_ADDFORM *r_u, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "spoolss_io_r_addform");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-       if(!prs_werror("status",        ps, depth, &r_u->status))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-********************************************************************/  
-
 bool spoolss_io_q_setform(const char *desc, SPOOL_Q_SETFORM *q_u, prs_struct *ps, int depth)
 {
        uint32 useless_ptr=1;
@@ -6960,21 +6915,6 @@ bool smb_io_printprocessordirectory_1(const char *desc, RPC_BUFFER *buffer, PRIN
        return True;
 }
 
-/*******************************************************************
- * init a structure.
- ********************************************************************/
-
-bool make_spoolss_q_addform(SPOOL_Q_ADDFORM *q_u, POLICY_HND *handle, 
-                           int level, FORM *form)
-{
-       memcpy(&q_u->handle, handle, sizeof(POLICY_HND));
-       q_u->level = level;
-       q_u->level2 = level;
-       memcpy(&q_u->form, form, sizeof(FORM));
-
-       return True;
-}
-
 /*******************************************************************
  * init a structure.
  ********************************************************************/