Remove unused marshalling for SRV_NET_FILE_SET_SECDESC and SRV_R_NET_FILE_GET_SECDESC.

Guenther

diff --git a/source/include/rpc_srvsvc.h b/source/include/rpc_srvsvc.h
index 3ea55bd167946b475db61e6d25e0692c6f6744d8..60ad23eb480f357340b9facca1c89c85021f6c1d 100644 (file)
--- a/source/include/rpc_srvsvc.h
+++ b/source/include/rpc_srvsvc.h
@@ -652,50 +652,4 @@ typedef struct {
        WERROR status;      
 } SRV_R_NET_FILE_ENUM;
 
-/* SRV_Q_NET_FILE_QUERY_SECDESC */
-typedef struct q_net_file_query_secdesc
-{
-       uint32  ptr_srv_name;
-       UNISTR2 uni_srv_name;
-       uint32  ptr_qual_name;
-       UNISTR2 uni_qual_name;
-       UNISTR2 uni_file_name;
-       uint32  unknown1;
-       uint32  unknown2;
-       uint32  unknown3;
-} SRV_Q_NET_FILE_QUERY_SECDESC;
-
-/* SRV_R_NET_FILE_QUERY_SECDESC */
-typedef struct r_net_file_query_secdesc
-{
-       uint32 ptr_response;
-       uint32 size_response;
-       uint32 ptr_secdesc;
-       uint32 size_secdesc;
-       SEC_DESC *sec_desc;
-       WERROR status;
-} SRV_R_NET_FILE_QUERY_SECDESC;
-
-/* SRV_Q_NET_FILE_SET_SECDESC */
-typedef struct q_net_file_set_secdesc
-{
-       uint32  ptr_srv_name;
-       UNISTR2 uni_srv_name;
-       uint32  ptr_qual_name;
-       UNISTR2 uni_qual_name;
-       UNISTR2 uni_file_name;
-       uint32  sec_info;
-       uint32  size_set;
-       uint32  ptr_secdesc;
-       uint32  size_secdesc;
-       SEC_DESC *sec_desc;
-} SRV_Q_NET_FILE_SET_SECDESC;
-
-/* SRV_R_NET_FILE_SET_SECDESC */
-typedef struct r_net_file_set_secdesc
-{
-       WERROR status;
-} SRV_R_NET_FILE_SET_SECDESC;
-
-
 #endif /* _RPC_SRVSVC_H */

diff --git a/source/rpc_parse/parse_srv.c b/source/rpc_parse/parse_srv.c
index b4cc08748b899099e3df368bdfcb4e290935cf90..9e42ef6158f58a63bc4db35aa7893737e4be9226 100644 (file)
--- a/source/rpc_parse/parse_srv.c
+++ b/source/rpc_parse/parse_srv.c
@@ -2692,168 +2692,3 @@ bool srv_io_r_net_disk_enum(const char *desc, SRV_R_NET_DISK_ENUM *r_n, prs_stru
 
        return True;
 }
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-bool srv_io_q_net_file_query_secdesc(const char *desc, SRV_Q_NET_FILE_QUERY_SECDESC *q_n, prs_struct *ps, int depth)
-{
-       if (q_n == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "srv_io_q_net_file_query_secdesc");
-       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("ptr_qual_name", ps, depth, &q_n->ptr_qual_name))
-               return False;
-
-       if(!smb_io_unistr2("", &q_n->uni_qual_name, True, ps, depth))
-               return False;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_unistr2("", &q_n->uni_file_name, True, ps, depth))
-               return False;
-
-       if(!prs_uint32("unknown1", ps, depth, &q_n->unknown1))
-               return False;
-
-       if(!prs_uint32("unknown2", ps, depth, &q_n->unknown2))
-               return False;
-
-       if(!prs_uint32("unknown3", ps, depth, &q_n->unknown3))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-bool srv_io_r_net_file_query_secdesc(const char *desc, SRV_R_NET_FILE_QUERY_SECDESC *r_n, prs_struct *ps, int depth)
-{
-       if (r_n == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "srv_io_r_net_file_query_secdesc");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("ptr_response", ps, depth, &r_n->ptr_response))
-               return False;
-
-       if(!prs_uint32("size_response", ps, depth, &r_n->size_response))
-               return False;
-
-       if(!prs_uint32("ptr_secdesc", ps, depth, &r_n->ptr_secdesc))
-               return False;
-
-       if(!prs_uint32("size_secdesc", ps, depth, &r_n->size_secdesc))
-               return False;
-
-       if(!sec_io_desc("sec_desc", &r_n->sec_desc, ps, depth))
-               return False;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_werror("status", ps, depth, &r_n->status))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-bool srv_io_q_net_file_set_secdesc(const char *desc, SRV_Q_NET_FILE_SET_SECDESC *q_n, prs_struct *ps, int depth)
-{
-       if (q_n == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "srv_io_q_net_file_set_secdesc");
-       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("ptr_qual_name", ps, depth, &q_n->ptr_qual_name))
-               return False;
-
-       if(!smb_io_unistr2("", &q_n->uni_qual_name, True, ps, depth))
-               return False;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_unistr2("", &q_n->uni_file_name, True, ps, depth))
-               return False;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("sec_info", ps, depth, &q_n->sec_info))
-               return False;
-
-       if(!prs_uint32("size_set", ps, depth, &q_n->size_set))
-               return False;
-
-       if(!prs_uint32("ptr_secdesc", ps, depth, &q_n->ptr_secdesc))
-               return False;
-
-       if(!prs_uint32("size_secdesc", ps, depth, &q_n->size_secdesc))
-               return False;
-
-       if(!sec_io_desc("sec_desc", &q_n->sec_desc, ps, depth))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-bool srv_io_r_net_file_set_secdesc(const char *desc, SRV_R_NET_FILE_SET_SECDESC *r_n, prs_struct *ps, int depth)
-{
-       if (r_n == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "srv_io_r_net_file_set_secdesc");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_werror("status", ps, depth, &r_n->status))
-               return False;
-
-       return True;
-}