[GLUE] Rsync SAMBA_3_0 SVN r25598 in order to create the v3-0-test branch.samba-misc-tags/initial-v3-0-test

1 files changed, 4 insertions, 106 deletions

diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
index 15bf2b3283d..5837ee6fd84 100644
--- a/source/rpc_parse/parse_net.c
+++ b/source/rpc_parse/parse_net.c
@@ -566,90 +566,6 @@ BOOL net_io_r_getanydcname(const char *desc, NET_R_GETANYDCNAME *r_t, prs_struct
 	return True;
 }
 
-
-/*******************************************************************
- Inits an NET_R_GETDCNAME structure.
-********************************************************************/
-void init_net_q_getdcname(NET_Q_GETDCNAME *r_t, const char *logon_server,
-			  const char *domainname)
-{
-	DEBUG(5,("init_q_getdcname\n"));
-
-	init_unistr2(&r_t->uni_logon_server, logon_server, UNI_STR_TERMINATE);
-	r_t->ptr_domainname = (domainname != NULL);
-	init_unistr2(&r_t->uni_domainname, domainname, UNI_STR_TERMINATE);
-}
-
-/*******************************************************************
- Reads or writes an NET_Q_GETDCNAME structure.
-********************************************************************/
-
-BOOL net_io_q_getdcname(const char *desc, NET_Q_GETDCNAME *r_t, prs_struct *ps,
-			int depth)
-{
-	if (r_t == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "net_io_q_getdcname");
-	depth++;
-
-	if (!smb_io_unistr2("logon_server", &r_t->uni_logon_server,
-			    1, ps, depth))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_uint32("ptr_domainname", ps, depth, &r_t->ptr_domainname))
-		return False;
-
-	if (!smb_io_unistr2("domainname", &r_t->uni_domainname,
-			    r_t->ptr_domainname, ps, depth))
-		return False;
-
-	return True;
-}
-
-
-/*******************************************************************
- Inits an NET_R_GETDCNAME structure.
-********************************************************************/
-void init_net_r_getdcname(NET_R_GETDCNAME *r_t, const char *dcname)
-{
-	DEBUG(5,("init_r_getdcname\n"));
-
-	init_unistr2(&r_t->uni_dcname, dcname, UNI_STR_TERMINATE);
-}
-
-/*******************************************************************
- Reads or writes an NET_R_GETDCNAME structure.
-********************************************************************/
-
-BOOL net_io_r_getdcname(const char *desc, NET_R_GETDCNAME *r_t, prs_struct *ps,
-			int depth)
-{
-	if (r_t == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "net_io_r_getdcname");
-	depth++;
-
-	if (!prs_uint32("ptr_dcname", ps, depth, &r_t->ptr_dcname))
-		return False;
-
-	if (!smb_io_unistr2("dcname", &r_t->uni_dcname,
-			    r_t->ptr_dcname, ps, depth))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-
-	if (!prs_werror("status", ps, depth, &r_t->status))
-		return False;
-
-	return True;
-}
-
 /*******************************************************************
  Inits an NET_R_TRUST_DOM_LIST structure.
 ********************************************************************/
@@ -1154,10 +1070,10 @@ void init_id_info1(NET_ID_INFO_1 *id, const char *domain_name,
 		unsigned char key[16];
 #ifdef DEBUG_PASSWORD
 		DEBUG(100,("lm cypher:"));
-		dump_data(100, lm_cypher, 16);
+		dump_data(100, (char *)lm_cypher, 16);
 
 		DEBUG(100,("nt cypher:"));
-		dump_data(100, nt_cypher, 16);
+		dump_data(100, (char *)nt_cypher, 16);
 #endif
 
 		memset(key, 0, 16);
@@ -1170,10 +1086,10 @@ void init_id_info1(NET_ID_INFO_1 *id, const char *domain_name,
 
 #ifdef DEBUG_PASSWORD
 		DEBUG(100,("encrypt of lm owf password:"));
-		dump_data(100, lm_owf, 16);
+		dump_data(100, (char *)lm_owf, 16);
 
 		DEBUG(100,("encrypt of nt owf password:"));
-		dump_data(100, nt_owf, 16);
+		dump_data(100, (char *)nt_owf, 16);
 #endif
 		/* set up pointers to cypher blocks */
 		lm_cypher = lm_owf;
@@ -1376,21 +1292,6 @@ void init_sam_info(DOM_SAM_INFO *sam,
 }
 
 /*******************************************************************
- Inits a DOM_SAM_INFO structure.
-********************************************************************/
-
-void init_sam_info_ex(DOM_SAM_INFO_EX *sam,
-		      const char *logon_srv, const char *comp_name,
-		      uint16 logon_level, NET_ID_INFO_CTR *ctr)
-{
-	DEBUG(5,("init_sam_info_ex: %d\n", __LINE__));
-
-	init_clnt_srv(&sam->client, logon_srv, comp_name);
-	sam->logon_level  = logon_level;
-	sam->ctr          = ctr;
-}
-
-/*******************************************************************
  Reads or writes a DOM_SAM_INFO structure.
 ********************************************************************/
 
@@ -2008,9 +1909,6 @@ BOOL net_io_q_sam_logon_ex(const char *desc, NET_Q_SAM_LOGON_EX *q_l, prs_struct
 	if(!prs_uint16("validation_level", ps, depth, &q_l->validation_level))
 		return False;
 
-	if (!prs_align(ps))
-		return False;
-
 	if(!prs_uint32("flags  ", ps, depth, &q_l->flags))
 		return False;