4 files changed, 1 insertions, 8 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp.c b/source4/auth/ntlmssp/ntlmssp.c
index cea18c45a7..1b14e461c3 100644
--- a/source4/auth/ntlmssp/ntlmssp.c
+++ b/source4/auth/ntlmssp/ntlmssp.c
@@ -159,7 +159,6 @@ static NTSTATUS gensec_ntlmssp_update_find(struct gensec_ntlmssp_state *gensec_n
 		}
 	} else {
 		if (!msrpc_parse(gensec_ntlmssp_state, 
-				 lp_iconv_convenience(gensec_security->lp_ctx),
 				 &input, "Cd",
 				 "NTLMSSP",
 				 &ntlmssp_command)) {
diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c
index 0ef40200fe..31da9fc927 100644
--- a/source4/auth/ntlmssp/ntlmssp_client.c
+++ b/source4/auth/ntlmssp/ntlmssp_client.c
@@ -122,7 +122,6 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security,
 	}
 
 	if (!msrpc_parse(mem_ctx,
-		         lp_iconv_convenience(gensec_security->lp_ctx),
 			 &in, "CdBd",
 			 "NTLMSSP",
 			 &ntlmssp_command, 
@@ -160,7 +159,6 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security,
 	}
 
 	if (!msrpc_parse(mem_ctx,
-			 lp_iconv_convenience(gensec_security->lp_ctx),
 			 &in, chal_parse_string,
 			 "NTLMSSP",
 			 &ntlmssp_command, 
diff --git a/source4/auth/ntlmssp/ntlmssp_parse.c b/source4/auth/ntlmssp/ntlmssp_parse.c
index 24f3ad27af..d606b8d563 100644
--- a/source4/auth/ntlmssp/ntlmssp_parse.c
+++ b/source4/auth/ntlmssp/ntlmssp_parse.c
@@ -186,7 +186,7 @@ if ((head_ofs + amount) > blob->length) { \
         return false; \
 }
 
-/*
+/**
   this is a tiny msrpc packet parser. This the the partner of msrpc_gen
 
   format specifiers are:
@@ -200,7 +200,6 @@ if ((head_ofs + amount) > blob->length) { \
  */
 
 bool msrpc_parse(TALLOC_CTX *mem_ctx, 
-		 struct smb_iconv_convenience *iconv_convenience, 
 		 const DATA_BLOB *blob,
 		 const char *format, ...)
 {
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index 38973f623d..cb336d5b46 100644
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -136,7 +136,6 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security,
 
 	if (in.length) {
 		if ((in.length < 16) || !msrpc_parse(out_mem_ctx, 
-				 lp_iconv_convenience(gensec_security->lp_ctx),
 				 			 &in, "Cdd",
 							 "NTLMSSP",
 							 &ntlmssp_command,
@@ -282,7 +281,6 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms
 
 	/* now the NTLMSSP encoded auth hashes */
 	if (!msrpc_parse(gensec_ntlmssp_state, 
-			 lp_iconv_convenience(gensec_ntlmssp_state->gensec_security->lp_ctx),
 			 &request, parse_string,
 			 "NTLMSSP", 
 			 &ntlmssp_command, 
@@ -309,7 +307,6 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms
 
 		/* now the NTLMSSP encoded auth hashes */
 		if (!msrpc_parse(gensec_ntlmssp_state, 
-			 	 lp_iconv_convenience(gensec_ntlmssp_state->gensec_security->lp_ctx),
 				 &request, parse_string,
 				 "NTLMSSP", 
 				 &ntlmssp_command,