[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2165-g9312755

[Günther Deschner]

The branch, v3-2-test has been updated
       via  9312755955eac9897c8117773f8cd7d1652b2bca (commit)
      from  243bdaeea7900ab6a65edfda877e8c225ec7b213 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 9312755955eac9897c8117773f8cd7d1652b2bca
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 13 10:27:15 2008 +0100

    Remove unused marshalling for NET_TRUST_DOM_LIST.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/include/rpc_netlogon.h |   16 ------
 source/rpc_parse/parse_net.c  |  102 -----------------------------------------
 2 files changed, 0 insertions(+), 118 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index bab2caa..f2802b8 100644
--- 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 55af821..257f461 100644
--- a/source/rpc_parse/parse_net.c
+++ b/source/rpc_parse/parse_net.c
@@ -479,108 +479,6 @@ bool net_io_r_logon_ctrl(const char *desc, NET_R_LOGON_CTRL *r_l, prs_struct *ps
 }
 
 /*******************************************************************
- 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.
 ********************************************************************/
 


-- 
Samba Shared Repository