2 files changed, 9 insertions, 8 deletions

diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index fe65aaf4d4..b38f55983d 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -978,7 +978,9 @@ BOOL smb_io_dom_rid3(char *desc,  DOM_RID3 *rid3, prs_struct *ps, int depth)
 /*******************************************************************
 makes a DOM_CLNT_SRV structure.
 ********************************************************************/
-static BOOL make_clnt_srv(DOM_CLNT_SRV *log, char *logon_srv, char *comp_name)
+static BOOL make_clnt_srv(DOM_CLNT_SRV *log,
+				const char *logon_srv, 
+				const char *comp_name)
 {
 	if (log == NULL) return False;
 
@@ -1122,7 +1124,7 @@ BOOL smb_io_cred(char *desc,  DOM_CRED *cred, prs_struct *ps, int depth)
 makes a DOM_CLNT_INFO2 structure.
 ********************************************************************/
 BOOL make_clnt_info2(DOM_CLNT_INFO2 *clnt,
-				char *logon_srv, char *comp_name,
+				const char *logon_srv, const char *comp_name,
 				DOM_CRED *clnt_cred)
 {
 	if (clnt == NULL) return False;
@@ -1170,8 +1172,8 @@ BOOL smb_io_clnt_info2(char *desc,  DOM_CLNT_INFO2 *clnt, prs_struct *ps, int de
 makes a DOM_CLNT_INFO structure.
 ********************************************************************/
 BOOL make_clnt_info(DOM_CLNT_INFO *clnt,
-		char *logon_srv, char *acct_name,
-		uint16 sec_chan, char *comp_name,
+		const char *logon_srv, const char *acct_name,
+		uint16 sec_chan, const char *comp_name,
 				DOM_CRED *cred)
 {
 	if (clnt == NULL || cred == NULL) return False;
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c
index cd1476e201..455129b6f9 100644
--- a/source3/rpc_parse/parse_net.c
+++ b/source3/rpc_parse/parse_net.c
@@ -884,7 +884,7 @@ BOOL make_sam_info(DOM_SAM_INFO *sam,
 				const char *logon_srv, const char *comp_name,
 				DOM_CRED *clnt_cred,
 				DOM_CRED *rtn_cred, uint16 logon_level,
-				NET_ID_INFO_CTR *ctr, uint16 validation_level)
+				NET_ID_INFO_CTR *ctr)
 {
 	if (sam == NULL) return False;
 
@@ -904,7 +904,6 @@ BOOL make_sam_info(DOM_SAM_INFO *sam,
 
 	sam->logon_level  = logon_level;
 	sam->ctr          = ctr;
-	sam->validation_level = validation_level;
 
 	return True;
 }
@@ -970,8 +969,6 @@ static BOOL smb_io_sam_info(char *desc,  DOM_SAM_INFO *sam, prs_struct *ps, int
 		net_io_id_info_ctr("logon_info", sam->ctr, ps, depth);
 	}
 
-	prs_uint16("validation_level", ps, depth, &(sam->validation_level));
-
 	return True;
 }
 
@@ -1194,6 +1191,8 @@ BOOL net_io_q_sam_logon(char *desc,  NET_Q_SAM_LOGON *q_l, prs_struct *ps, int d
 	prs_align(ps);
 	
 	smb_io_sam_info("", &(q_l->sam_id), ps, depth);           /* domain SID */
+	prs_uint16("validation_level", ps, depth, &(q_l->validation_level));
+
 
 	return True;
 }