summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-07-12 19:33:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:19:17 -0500
commitf8be59e0a6aa62e1a1c661fda5cc28b6ddcb22cc (patch)
tree2811a3a9571fbadac82d4a94023f9ba70e0b20b9
parent8dbe2651d3c390250f6c959be4475b7ab3d22137 (diff)
downloadsamba-f8be59e0a6aa62e1a1c661fda5cc28b6ddcb22cc.tar.gz
samba-f8be59e0a6aa62e1a1c661fda5cc28b6ddcb22cc.tar.bz2
samba-f8be59e0a6aa62e1a1c661fda5cc28b6ddcb22cc.zip
r16994: Fix bug #3923, reported by jason@ncac.gwu.edu. Incorrect type
used. Jeremy. (This used to be commit 738b99078c6e0ececa6c0268258510a4e97f84e7)
-rw-r--r--source3/libndr/ndr_string.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libndr/ndr_string.c b/source3/libndr/ndr_string.c
index d6c842a653..8f2ec10a59 100644
--- a/source3/libndr/ndr_string.c
+++ b/source3/libndr/ndr_string.c
@@ -549,7 +549,7 @@ NTSTATUS ndr_check_string_terminator(struct ndr_pull *ndr, uint32_t count, uint3
return NT_STATUS_OK;
}
-NTSTATUS ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, int chset)
+NTSTATUS ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, charset_t chset)
{
int ret;
if (length == 0) {