summaryrefslogtreecommitdiff
path: root/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-05-10 00:42:06 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-05-18 11:45:31 +0200
commitb8268cf7b0264ea28f684cbdfbf462e68a018d83 (patch)
tree638192f21ae437a5c59ab2ec4500c9ea8c9f7b54 /libcli
parentf9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d (diff)
downloadsamba-b8268cf7b0264ea28f684cbdfbf462e68a018d83.tar.gz
samba-b8268cf7b0264ea28f684cbdfbf462e68a018d83.tar.bz2
samba-b8268cf7b0264ea28f684cbdfbf462e68a018d83.zip
s3: Remove use of iconv_convenience.
Diffstat (limited to 'libcli')
-rw-r--r--libcli/auth/ntlmssp_ndr.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/libcli/auth/ntlmssp_ndr.c b/libcli/auth/ntlmssp_ndr.c
index 8f15044e1a..fd31e853d2 100644
--- a/libcli/auth/ntlmssp_ndr.c
+++ b/libcli/auth/ntlmssp_ndr.c
@@ -36,10 +36,10 @@ do { \
return NT_STATUS_OK; \
} while(0);
-#define NTLMSSP_PUSH_MESSAGE(type, blob, mem_ctx, ic, r) \
+#define NTLMSSP_PUSH_MESSAGE(type, blob, mem_ctx, r) \
do { \
enum ndr_err_code __ndr_err; \
- __ndr_err = ndr_push_struct_blob(blob, mem_ctx, ic, r, \
+ __ndr_err = ndr_push_struct_blob(blob, mem_ctx, r, \
(ndr_push_flags_fn_t)ndr_push_ ##type); \
if (!NDR_ERR_CODE_IS_SUCCESS(__ndr_err)) { \
return ndr_map_error2ntstatus(__ndr_err); \
@@ -52,7 +52,6 @@ do { \
* Pull NTLMSSP NEGOTIATE_MESSAGE struct from a blob
* @param blob The plain packet blob
* @param mem_ctx A talloc context
- * @param ic Iconv convenience structure
* @param r Pointer to a NTLMSSP NEGOTIATE_MESSAGE structure
*/
@@ -67,7 +66,6 @@ NTSTATUS ntlmssp_pull_NEGOTIATE_MESSAGE(const DATA_BLOB *blob,
* Pull NTLMSSP CHALLENGE_MESSAGE struct from a blob
* @param blob The plain packet blob
* @param mem_ctx A talloc context
- * @param ic Iconv convenience structure
* @param r Pointer to a NTLMSSP CHALLENGE_MESSAGE structure
*/
@@ -82,7 +80,6 @@ NTSTATUS ntlmssp_pull_CHALLENGE_MESSAGE(const DATA_BLOB *blob,
* Pull NTLMSSP AUTHENTICATE_MESSAGE struct from a blob
* @param blob The plain packet blob
* @param mem_ctx A talloc context
- * @param ic Iconv convenience structure
* @param r Pointer to a NTLMSSP AUTHENTICATE_MESSAGE structure
*/
@@ -97,7 +94,6 @@ NTSTATUS ntlmssp_pull_AUTHENTICATE_MESSAGE(const DATA_BLOB *blob,
* Push NTLMSSP NEGOTIATE_MESSAGE struct into a blob
* @param blob The plain packet blob
* @param mem_ctx A talloc context
- * @param ic Iconv convenience structure
* @param r Pointer to a NTLMSSP NEGOTIATE_MESSAGE structure
*/
@@ -112,7 +108,6 @@ NTSTATUS ntlmssp_push_NEGOTIATE_MESSAGE(DATA_BLOB *blob,
* Push NTLMSSP CHALLENGE_MESSAGE struct into a blob
* @param blob The plain packet blob
* @param mem_ctx A talloc context
- * @param ic Iconv convenience structure
* @param r Pointer to a NTLMSSP CHALLENGE_MESSAGE structure
*/
@@ -127,7 +122,6 @@ NTSTATUS ntlmssp_push_CHALLENGE_MESSAGE(DATA_BLOB *blob,
* Push NTLMSSP AUTHENTICATE_MESSAGE struct into a blob
* @param blob The plain packet blob
* @param mem_ctx A talloc context
- * @param ic Iconv convenience structure
* @param r Pointer to a NTLMSSP AUTHENTICATE_MESSAGE structure
*/