summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-03-04 23:40:53 +0100
committerGünther Deschner <gd@samba.org>2008-03-05 09:50:11 +0100
commit2b5d47a093f0329159fe3f16316fd55e3b49e1a5 (patch)
tree6cd7bfd63b9bb65ecfee3189e77a96376c72a599 /source3
parenteb44792a22f6889edcaa0760ab4ca86e9313122f (diff)
downloadsamba-2b5d47a093f0329159fe3f16316fd55e3b49e1a5.tar.gz
samba-2b5d47a093f0329159fe3f16316fd55e3b49e1a5.tar.bz2
samba-2b5d47a093f0329159fe3f16316fd55e3b49e1a5.zip
Remove unused marshalling for SRV_NET_SRV_SET_INFO.
Guenther (This used to be commit a7aef18797407b1f451191647d4b0225ac838817)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/rpc_srvsvc.h85
-rw-r--r--source3/rpc_parse/parse_srv.c238
2 files changed, 0 insertions, 323 deletions
diff --git a/source3/include/rpc_srvsvc.h b/source3/include/rpc_srvsvc.h
index ad9b547d41..e6c538a041 100644
--- a/source3/include/rpc_srvsvc.h
+++ b/source3/include/rpc_srvsvc.h
@@ -683,91 +683,6 @@ typedef struct {
WERROR status;
} SRV_R_NET_FILE_ENUM;
-/* SRV_INFO_100 */
-typedef struct srv_info_100_info
-{
- uint32 platform_id; /* 0x500 */
- uint32 ptr_name; /* pointer to server name */
-
- UNISTR2 uni_name; /* server name "server" */
-
-} SRV_INFO_100;
-
-/* SRV_INFO_101 */
-typedef struct srv_info_101_info
-{
- uint32 platform_id; /* 0x500 */
- uint32 ptr_name; /* pointer to server name */
- uint32 ver_major; /* 0x4 */
- uint32 ver_minor; /* 0x2 */
- uint32 srv_type; /* browse etc type */
- uint32 ptr_comment; /* pointer to server comment */
-
- UNISTR2 uni_name; /* server name "server" */
- UNISTR2 uni_comment; /* server comment "samba x.x.x blah" */
-
-} SRV_INFO_101;
-
-/* SRV_INFO_102 */
-typedef struct srv_info_102_info
-{
- uint32 platform_id; /* 0x500 */
- uint32 ptr_name; /* pointer to server name */
- uint32 ver_major; /* 0x4 */
- uint32 ver_minor; /* 0x2 */
- uint32 srv_type; /* browse etc type */
- uint32 ptr_comment; /* pointer to server comment */
- uint32 users; /* 0xffff ffff*/
- uint32 disc; /* 0xf */
- uint32 hidden; /* 0x0 */
- uint32 announce; /* 240 */
- uint32 ann_delta; /* 3000 */
- uint32 licenses; /* 0 */
- uint32 ptr_usr_path; /* pointer to user path */
-
- UNISTR2 uni_name; /* server name "server" */
- UNISTR2 uni_comment; /* server comment "samba x.x.x blah" */
- UNISTR2 uni_usr_path; /* "c:\" (eh?) */
-
-} SRV_INFO_102;
-
-
-/* SRV_INFO_CTR */
-typedef struct srv_info_ctr_info
-{
- uint32 switch_value; /* switch value */
- uint32 ptr_srv_ctr; /* pointer to server info */
- union
- {
- SRV_INFO_102 sv102; /* server info level 102 */
- SRV_INFO_101 sv101; /* server info level 101 */
- SRV_INFO_100 sv100; /* server info level 100 */
-
- } srv;
-
-} SRV_INFO_CTR;
-
-/* SRV_Q_NET_SRV_SET_INFO */
-typedef struct q_net_srv_set_info
-{
- uint32 ptr_srv_name;
- UNISTR2 uni_srv_name; /* "\\server" */
- uint32 switch_value;
-
- SRV_INFO_CTR *ctr;
-
-} SRV_Q_NET_SRV_SET_INFO;
-
-
-/* SRV_R_NET_SRV_SET_INFO */
-typedef struct r_net_srv_set_info
-{
- uint32 switch_value; /* switch value */
-
- WERROR status; /* return status */
-
-} SRV_R_NET_SRV_SET_INFO;
-
/* SRV_Q_NET_REMOTE_TOD */
typedef struct q_net_remote_tod
{
diff --git a/source3/rpc_parse/parse_srv.c b/source3/rpc_parse/parse_srv.c
index 8561e16428..136aed5f16 100644
--- a/source3/rpc_parse/parse_srv.c
+++ b/source3/rpc_parse/parse_srv.c
@@ -2619,244 +2619,6 @@ bool srv_io_r_net_file_enum(const char *desc, SRV_R_NET_FILE_ENUM *r_n, prs_stru
}
/*******************************************************************
- Reads or writes a SRV_INFO_101 structure.
- ********************************************************************/
-
-static bool srv_io_info_100(const char *desc, SRV_INFO_100 *sv100, prs_struct *ps, int depth)
-{
- if (sv100 == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "srv_io_info_100");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_uint32("platform_id ", ps, depth, &sv100->platform_id))
- return False;
- if(!prs_uint32("ptr_name ", ps, depth, &sv100->ptr_name))
- return False;
-
- if(!smb_io_unistr2("uni_name ", &sv100->uni_name, True, ps, depth))
- return False;
-
- return True;
-}
-
-/*******************************************************************
- Reads or writes a SRV_INFO_101 structure.
- ********************************************************************/
-
-static bool srv_io_info_101(const char *desc, SRV_INFO_101 *sv101, prs_struct *ps, int depth)
-{
- if (sv101 == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "srv_io_info_101");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_uint32("platform_id ", ps, depth, &sv101->platform_id))
- return False;
- if(!prs_uint32("ptr_name ", ps, depth, &sv101->ptr_name))
- return False;
- if(!prs_uint32("ver_major ", ps, depth, &sv101->ver_major))
- return False;
- if(!prs_uint32("ver_minor ", ps, depth, &sv101->ver_minor))
- return False;
- if(!prs_uint32("srv_type ", ps, depth, &sv101->srv_type))
- return False;
- if(!prs_uint32("ptr_comment ", ps, depth, &sv101->ptr_comment))
- return False;
-
- if(!prs_align(ps))
- return False;
-
- if(!smb_io_unistr2("uni_name ", &sv101->uni_name, True, ps, depth))
- return False;
- if(!smb_io_unistr2("uni_comment ", &sv101->uni_comment, True, ps, depth))
- return False;
-
- return True;
-}
-
-static bool srv_io_info_102(const char *desc, SRV_INFO_102 *sv102, prs_struct *ps, int depth)
-{
- if (sv102 == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "srv_io_info102");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_uint32("platform_id ", ps, depth, &sv102->platform_id))
- return False;
- if(!prs_uint32("ptr_name ", ps, depth, &sv102->ptr_name))
- return False;
- if(!prs_uint32("ver_major ", ps, depth, &sv102->ver_major))
- return False;
- if(!prs_uint32("ver_minor ", ps, depth, &sv102->ver_minor))
- return False;
- if(!prs_uint32("srv_type ", ps, depth, &sv102->srv_type))
- return False;
- if(!prs_uint32("ptr_comment ", ps, depth, &sv102->ptr_comment))
- return False;
-
- /* same as 101 up to here */
-
- if(!prs_uint32("users ", ps, depth, &sv102->users))
- return False;
- if(!prs_uint32("disc ", ps, depth, &sv102->disc))
- return False;
- if(!prs_uint32("hidden ", ps, depth, &sv102->hidden))
- return False;
- if(!prs_uint32("announce ", ps, depth, &sv102->announce))
- return False;
- if(!prs_uint32("ann_delta ", ps, depth, &sv102->ann_delta))
- return False;
- if(!prs_uint32("licenses ", ps, depth, &sv102->licenses))
- return False;
- if(!prs_uint32("ptr_usr_path", ps, depth, &sv102->ptr_usr_path))
- return False;
-
- if(!smb_io_unistr2("uni_name ", &sv102->uni_name, True, ps, depth))
- return False;
- if(!prs_align(ps))
- return False;
- if(!smb_io_unistr2("uni_comment ", &sv102->uni_comment, True, ps, depth))
- return False;
- if(!prs_align(ps))
- return False;
- if(!smb_io_unistr2("uni_usr_path", &sv102->uni_usr_path, True, ps, depth))
- return False;
-
- return True;
-}
-
-/*******************************************************************
- Reads or writes a SRV_INFO_102 structure.
- ********************************************************************/
-
-static bool srv_io_info_ctr(const char *desc, SRV_INFO_CTR *ctr, prs_struct *ps, int depth)
-{
- if (ctr == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "srv_io_info_ctr");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_uint32("switch_value", ps, depth, &ctr->switch_value))
- return False;
- if(!prs_uint32("ptr_srv_ctr ", ps, depth, &ctr->ptr_srv_ctr))
- return False;
-
- if (ctr->ptr_srv_ctr != 0 && ctr->switch_value != 0 && ctr != NULL) {
- switch (ctr->switch_value) {
- case 100:
- if(!srv_io_info_100("sv100", &ctr->srv.sv100, ps, depth))
- return False;
- break;
- case 101:
- if(!srv_io_info_101("sv101", &ctr->srv.sv101, ps, depth))
- return False;
- break;
- case 102:
- if(!srv_io_info_102("sv102", &ctr->srv.sv102, ps, depth))
- return False;
- break;
- default:
- DEBUG(5,("%s no server info at switch_value %d\n",
- tab_depth(5,depth), ctr->switch_value));
- break;
- }
- if(!prs_align(ps))
- return False;
- }
-
- return True;
-}
-
-/*******************************************************************
- Inits a SRV_R_NET_SRV_SET_INFO structure.
- ********************************************************************/
-
-void init_srv_r_net_srv_set_info(SRV_R_NET_SRV_SET_INFO *srv,
- uint32 switch_value, WERROR status)
-{
- DEBUG(5,("init_srv_r_net_srv_set_info\n"));
-
- srv->switch_value = switch_value;
- srv->status = status;
-}
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-bool srv_io_q_net_srv_set_info(const char *desc, SRV_Q_NET_SRV_SET_INFO *q_n,
- prs_struct *ps, int depth)
-{
- prs_debug(ps, depth, desc, "srv_io_q_net_srv_set_info");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_uint32("ptr_srv_name ", ps, depth, &q_n->ptr_srv_name))
- return False;
- if(!smb_io_unistr2("", &q_n->uni_srv_name, True, ps, depth))
- return False;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_uint32("switch_value ", ps, depth, &q_n->switch_value))
- return False;
-
- if (UNMARSHALLING(ps)) {
- q_n->ctr = PRS_ALLOC_MEM(ps, SRV_INFO_CTR, 1);
-
- if (!q_n->ctr)
- return False;
- }
-
- if(!srv_io_info_ctr("ctr", q_n->ctr, ps, depth))
- return False;
-
- return True;
-}
-
-/*******************************************************************
- Reads or writes a structure.
- ********************************************************************/
-
-bool srv_io_r_net_srv_set_info(const char *desc, SRV_R_NET_SRV_SET_INFO *r_n,
- prs_struct *ps, int depth)
-{
- prs_debug(ps, depth, desc, "srv_io_r_net_srv_set_info");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_uint32("switch value ", ps, depth, &r_n->switch_value))
- return False;
-
- if(!prs_werror("status", ps, depth, &r_n->status))
- return False;
-
- return True;
-}
-
-/*******************************************************************
Reads or writes a structure.
********************************************************************/