The branch, master has been updated
via 8614ce5ca74e71f931d1fa76d59b7c07271717c4 (commit)
via 4541aa5f846bc7b38e2873d65b5b6a5614a037b4 (commit)
from f9bf09e255c20672f1565aa9e3c51d1274958dcf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8614ce5ca74e71f931d1fa76d59b7c07271717c4
Author: Günther Deschner <[email protected]>
Date: Fri Mar 6 12:04:47 2009 +0100
s3-spoolss: remove old _spoolss_EnumForms.
Guenther
commit 4541aa5f846bc7b38e2873d65b5b6a5614a037b4
Author: Günther Deschner <[email protected]>
Date: Fri Mar 6 12:01:54 2009 +0100
s3-spoolss: use form flags from idl in rpcclient and net.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/include/proto.h | 4 -
source3/include/rpc_spoolss.h | 35 -----------
source3/rpc_parse/parse_spoolss.c | 110 -----------------------------------
source3/rpc_server/srv_spoolss_nt.c | 15 -----
source3/rpcclient/cmd_spoolss.c | 12 ++--
source3/utils/net_rpc_printer.c | 2 +-
6 files changed, 7 insertions(+), 171 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8395e2a..ffdef43 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5818,7 +5818,6 @@ bool smb_io_printer_driver_info_3(const char *desc,
RPC_BUFFER *buffer, DRIVER_I
bool smb_io_printer_driver_info_6(const char *desc, RPC_BUFFER *buffer,
DRIVER_INFO_6 *info, int depth);
bool smb_io_job_info_1(const char *desc, RPC_BUFFER *buffer, JOB_INFO_1 *info,
int depth);
bool smb_io_job_info_2(const char *desc, RPC_BUFFER *buffer, JOB_INFO_2 *info,
int depth);
-bool smb_io_form_1(const char *desc, RPC_BUFFER *buffer, FORM_1 *info, int
depth);
bool smb_io_port_1(const char *desc, RPC_BUFFER *buffer, PORT_INFO_1 *info,
int depth);
bool smb_io_port_2(const char *desc, RPC_BUFFER *buffer, PORT_INFO_2 *info,
int depth);
bool smb_io_printprocessor_info_1(const char *desc, RPC_BUFFER *buffer,
PRINTPROCESSOR_1 *info, int depth);
@@ -5840,7 +5839,6 @@ uint32 spoolss_size_printer_driver_info_3(DRIVER_INFO_3
*info);
uint32 spoolss_size_printer_driver_info_6(DRIVER_INFO_6 *info);
uint32 spoolss_size_job_info_1(JOB_INFO_1 *info);
uint32 spoolss_size_job_info_2(JOB_INFO_2 *info);
-uint32 spoolss_size_form_1(FORM_1 *info);
uint32 spoolss_size_port_info_1(PORT_INFO_1 *info);
uint32 spoolss_size_port_info_2(PORT_INFO_2 *info);
uint32 spoolss_size_printprocessor_info_1(PRINTPROCESSOR_1 *info);
@@ -5880,8 +5878,6 @@ bool
make_spoolss_q_enumprinterdrivers(SPOOL_Q_ENUMPRINTERDRIVERS *q_u,
uint32 level,
RPC_BUFFER *buffer, uint32 offered);
bool spoolss_io_q_enumprinterdrivers(const char *desc,
SPOOL_Q_ENUMPRINTERDRIVERS *q_u, prs_struct *ps, int depth);
-bool spoolss_io_q_enumforms(const char *desc, SPOOL_Q_ENUMFORMS *q_u,
prs_struct *ps, int depth);
-bool spoolss_io_r_enumforms(const char *desc, SPOOL_R_ENUMFORMS *r_u,
prs_struct *ps, int depth);
bool spoolss_io_r_enumports(const char *desc, SPOOL_R_ENUMPORTS *r_u,
prs_struct *ps, int depth);
bool spoolss_io_q_enumports(const char *desc, SPOOL_Q_ENUMPORTS *q_u,
prs_struct *ps, int depth);
bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 *buf5, uint32 len,
uint16 *src);
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 2b4a036..e101a27 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -769,41 +769,6 @@ typedef struct spool_r_enumprinterdrivers
}
SPOOL_R_ENUMPRINTERDRIVERS;
-#define FORM_USER 0
-#define FORM_BUILTIN 1
-#define FORM_PRINTER 2
-
-typedef struct spool_form_1
-{
- uint32 flag;
- UNISTR name;
- uint32 width;
- uint32 length;
- uint32 left;
- uint32 top;
- uint32 right;
- uint32 bottom;
-}
-FORM_1;
-
-typedef struct spool_q_enumforms
-{
- POLICY_HND handle;
- uint32 level;
- RPC_BUFFER *buffer;
- uint32 offered;
-}
-SPOOL_Q_ENUMFORMS;
-
-typedef struct spool_r_enumforms
-{
- RPC_BUFFER *buffer;
- uint32 needed;
- uint32 numofforms;
- WERROR status;
-}
-SPOOL_R_ENUMFORMS;
-
/********************************************/
typedef struct spool_q_enumprintprocessors
diff --git a/source3/rpc_parse/parse_spoolss.c
b/source3/rpc_parse/parse_spoolss.c
index e323606..181ad0e 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1136,40 +1136,6 @@ bool smb_io_job_info_2(const char *desc, RPC_BUFFER
*buffer, JOB_INFO_2 *info, i
}
/*******************************************************************
-********************************************************************/
-
-bool smb_io_form_1(const char *desc, RPC_BUFFER *buffer, FORM_1 *info, int
depth)
-{
- prs_struct *ps=&buffer->prs;
-
- prs_debug(ps, depth, desc, "smb_io_form_1");
- depth++;
-
- buffer->struct_start=prs_offset(ps);
-
- if (!prs_uint32("flag", ps, depth, &info->flag))
- return False;
-
- if (!smb_io_relstr("name", buffer, depth, &info->name))
- return False;
-
- if (!prs_uint32("width", ps, depth, &info->width))
- return False;
- if (!prs_uint32("length", ps, depth, &info->length))
- return False;
- if (!prs_uint32("left", ps, depth, &info->left))
- return False;
- if (!prs_uint32("top", ps, depth, &info->top))
- return False;
- if (!prs_uint32("right", ps, depth, &info->right))
- return False;
- if (!prs_uint32("bottom", ps, depth, &info->bottom))
- return False;
-
- return True;
-}
-
-/*******************************************************************
Parse a PORT_INFO_1 structure.
********************************************************************/
@@ -1646,26 +1612,6 @@ uint32 spoolss_size_job_info_2(JOB_INFO_2 *info)
/*******************************************************************
return the size required by a struct in the stream
-********************************************************************/
-
-uint32 spoolss_size_form_1(FORM_1 *info)
-{
- int size=0;
-
- size+=size_of_uint32( &info->flag );
- size+=size_of_relative_string( &info->name );
- size+=size_of_uint32( &info->width );
- size+=size_of_uint32( &info->length );
- size+=size_of_uint32( &info->left );
- size+=size_of_uint32( &info->top );
- size+=size_of_uint32( &info->right );
- size+=size_of_uint32( &info->bottom );
-
- return size;
-}
-
-/*******************************************************************
-return the size required by a struct in the stream
********************************************************************/
uint32 spoolss_size_port_info_1(PORT_INFO_1 *info)
@@ -2182,62 +2128,6 @@ bool spoolss_io_q_enumprinterdrivers(const char *desc,
SPOOL_Q_ENUMPRINTERDRIVER
}
/*******************************************************************
-********************************************************************/
-
-bool spoolss_io_q_enumforms(const char *desc, SPOOL_Q_ENUMFORMS *q_u,
prs_struct *ps, int depth)
-{
-
- prs_debug(ps, depth, desc, "spoolss_io_q_enumforms");
- 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_rpcbuffer_p("", ps, depth, &q_u->buffer))
- return False;
-
- if (!prs_align(ps))
- return False;
- if (!prs_uint32("offered", ps, depth, &q_u->offered))
- return False;
-
- return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool spoolss_io_r_enumforms(const char *desc, SPOOL_R_ENUMFORMS *r_u,
prs_struct *ps, int depth)
-{
- prs_debug(ps, depth, desc, "spoolss_io_r_enumforms");
- depth++;
-
- if (!prs_align(ps))
- return False;
-
- if (!prs_rpcbuffer_p("", ps, depth, &r_u->buffer))
- return False;
-
- if (!prs_align(ps))
- return False;
-
- if (!prs_uint32("size of buffer needed", ps, depth, &r_u->needed))
- return False;
-
- if (!prs_uint32("numofforms", ps, depth, &r_u->numofforms))
- return False;
-
- if (!prs_werror("status", ps, depth, &r_u->status))
- return False;
-
- return True;
-}
-
-/*******************************************************************
Parse a SPOOL_R_ENUMPORTS structure.
********************************************************************/
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index ec19279..0c496b9 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7244,21 +7244,6 @@ WERROR _spoolss_enumprinterdrivers( pipes_struct *p,
SPOOL_Q_ENUMPRINTERDRIVERS
/****************************************************************************
****************************************************************************/
-static void fill_form_1(FORM_1 *form, nt_forms_struct *list)
-{
- form->flag=list->flag;
- init_unistr(&form->name, list->name);
- form->width=list->width;
- form->length=list->length;
- form->left=list->left;
- form->top=list->top;
- form->right=list->right;
- form->bottom=list->bottom;
-}
-
-/****************************************************************************
-****************************************************************************/
-
static WERROR fill_form_info_1(TALLOC_CTX *mem_ctx,
struct spoolss_FormInfo1 *form,
nt_forms_struct *list)
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index c88cf89..fae5c55 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -1848,7 +1848,7 @@ static WERROR cmd_spoolss_addform(struct rpc_pipe_client
*cli, TALLOC_CTX *mem_c
switch (level) {
case 1:
- info1.flags = FORM_USER;
+ info1.flags = SPOOLSS_FORM_USER;
info1.form_name = argv[2];
info1.size.width = 100;
info1.size.height = 100;
@@ -1861,7 +1861,7 @@ static WERROR cmd_spoolss_addform(struct rpc_pipe_client
*cli, TALLOC_CTX *mem_c
break;
case 2:
- info2.flags = FORM_USER;
+ info2.flags = SPOOLSS_FORM_USER;
info2.form_name = argv[2];
info2.size.width = 100;
info2.size.height = 100;
@@ -1930,7 +1930,7 @@ static WERROR cmd_spoolss_setform(struct rpc_pipe_client
*cli, TALLOC_CTX *mem_c
/* Dummy up some values for the form data */
- info1.flags = FORM_PRINTER;
+ info1.flags = SPOOLSS_FORM_PRINTER;
info1.size.width = 100;
info1.size.height = 100;
info1.area.left = 0;
@@ -1963,11 +1963,11 @@ static WERROR cmd_spoolss_setform(struct
rpc_pipe_client *cli, TALLOC_CTX *mem_c
static const char *get_form_flag(int form_flag)
{
switch (form_flag) {
- case FORM_USER:
+ case SPOOLSS_FORM_USER:
return "FORM_USER";
- case FORM_BUILTIN:
+ case SPOOLSS_FORM_BUILTIN:
return "FORM_BUILTIN";
- case FORM_PRINTER:
+ case SPOOLSS_FORM_PRINTER:
return "FORM_PRINTER";
default:
return "unknown";
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 108ed50..950ca72 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -1768,7 +1768,7 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct
net_context *c,
/* only migrate FORM_PRINTER types, according to jerry
FORM_BUILTIN-types are hard-coded in samba */
- if (forms[f].info1.flags != FORM_PRINTER)
+ if (forms[f].info1.flags != SPOOLSS_FORM_PRINTER)
continue;
if (c->opt_verbose)
--
Samba Shared Repository
