Remove unused marshalling for NET_TRUST_DOM_LIST.

Guenther

diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index bab2caaf61d140e8cd031c84ecf5903267019674..f2802b8e72ae117b5498401a77eebbba99265b40 100644 (file)
--- a/source/include/rpc_netlogon.h
+++ b/source/include/rpc_netlogon.h
@@ -398,22 +398,6 @@ typedef struct net_r_logon_ctrl2_info {
        NTSTATUS status; /* return code */
 } NET_R_LOGON_CTRL2;
 
-/* NET_Q_TRUST_DOM_LIST - LSA Query Trusted Domains */
-typedef struct net_q_trust_dom_info {
-       uint32       ptr;             /* undocumented buffer pointer */
-       UNISTR2      uni_server_name; /* server name, starting with two '\'s */
-} NET_Q_TRUST_DOM_LIST;
-
-#define MAX_TRUST_DOMS 1
-
-/* NET_R_TRUST_DOM_LIST - response to LSA Trusted Domains */
-typedef struct net_r_trust_dom_info {
-       UNISTR2 uni_trust_dom_name[MAX_TRUST_DOMS];
-
-       NTSTATUS status; /* return code */
-} NET_R_TRUST_DOM_LIST;
-
-
 /* NEG_FLAGS */
 typedef struct neg_flags_info {
        uint32 neg_flags; /* negotiated flags */

diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
index 55af8211cf84a9c0f4638282de00eeb84c6ae638..257f461d7c4e906556c6322ed826ec8b85ee2abe 100644 (file)
--- a/source/rpc_parse/parse_net.c
+++ b/source/rpc_parse/parse_net.c
@@ -478,108 +478,6 @@ bool net_io_r_logon_ctrl(const char *desc, NET_R_LOGON_CTRL *r_l, prs_struct *ps
        return True;
 }
 
-/*******************************************************************
- Inits an NET_R_TRUST_DOM_LIST structure.
-********************************************************************/
-
-void init_r_trust_dom(NET_R_TRUST_DOM_LIST *r_t,
-                       uint32 num_doms, const char *dom_name)
-{
-       unsigned int i = 0;
-
-       DEBUG(5,("init_r_trust_dom\n"));
-
-       for (i = 0; i < MAX_TRUST_DOMS; i++) {
-               r_t->uni_trust_dom_name[i].uni_str_len = 0;
-               r_t->uni_trust_dom_name[i].uni_max_len = 0;
-       }
-       if (num_doms > MAX_TRUST_DOMS)
-               num_doms = MAX_TRUST_DOMS;
-
-       for (i = 0; i < num_doms; i++) {
-               fstring domain_name;
-               fstrcpy(domain_name, dom_name);
-               strupper_m(domain_name);
-               init_unistr2(&r_t->uni_trust_dom_name[i], domain_name, UNI_STR_TERMINATE);
-               /* the use of UNISTR2 here is non-standard. */
-               r_t->uni_trust_dom_name[i].offset = 0x1;
-       }
-       
-       r_t->status = NT_STATUS_OK;
-}
-
-/*******************************************************************
- Reads or writes an NET_R_TRUST_DOM_LIST structure.
-********************************************************************/
-
-bool net_io_r_trust_dom(const char *desc, NET_R_TRUST_DOM_LIST *r_t, prs_struct *ps, int depth)
-{
-       uint32 value;
-
-       if (r_t == NULL)
-                return False;
-
-       prs_debug(ps, depth, desc, "net_io_r_trust_dom");
-       depth++;
-
-       /* temporary code to give a valid response */
-       value=2;
-       if(!prs_uint32("status", ps, depth, &value))
-                return False;
-
-       value=1;
-       if(!prs_uint32("status", ps, depth, &value))
-                return False;
-       value=2;
-       if(!prs_uint32("status", ps, depth, &value))
-                return False;
-
-       value=0;
-       if(!prs_uint32("status", ps, depth, &value))
-                return False;
-
-       value=0;
-       if(!prs_uint32("status", ps, depth, &value))
-                return False;
-
-/* old non working code */
-#if 0
-       int i;
-
-       for (i = 0; i < MAX_TRUST_DOMS; i++) {
-               if (r_t->uni_trust_dom_name[i].uni_str_len == 0)
-                       break;
-               if(!smb_io_unistr2("", &r_t->uni_trust_dom_name[i], True, ps, depth))
-                        return False;
-       }
-
-       if(!prs_ntstatus("status", ps, depth, &r_t->status))
-                return False;
-#endif
-       return True;
-}
-
-
-/*******************************************************************
- Reads or writes an NET_Q_TRUST_DOM_LIST structure.
-********************************************************************/
-
-bool net_io_q_trust_dom(const char *desc, NET_Q_TRUST_DOM_LIST *q_l, prs_struct *ps, int depth)
-{
-       if (q_l == NULL)
-                return False;
-
-       prs_debug(ps, depth, desc, "net_io_q_trust_dom");
-       depth++;
-
-       if(!prs_uint32("ptr          ", ps, depth, &q_l->ptr))
-                return False;
-       if(!smb_io_unistr2 ("", &q_l->uni_server_name, q_l->ptr, ps, depth))
-                return False;
-
-       return True;
-}
-
 /*******************************************************************
  Inits an NET_Q_REQ_CHAL structure.
 ********************************************************************/