summaryrefslogtreecommitdiff
path: root/source4/librpc/ndr
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-31 04:15:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:24 -0500
commitaa985bdee09e222f9f3f1f49e1cc20e0760c6f32 (patch)
tree06a1196ade27f619759e53e23fb3fbe9c83121d0 /source4/librpc/ndr
parent5e6082b4b0e8d47d8634cf1b0c5bb460d0b6dbd1 (diff)
downloadsamba-aa985bdee09e222f9f3f1f49e1cc20e0760c6f32.tar.gz
samba-aa985bdee09e222f9f3f1f49e1cc20e0760c6f32.tar.bz2
samba-aa985bdee09e222f9f3f1f49e1cc20e0760c6f32.zip
r5118: added support for node status replies in nbtd. nmblookup -S now works against Samba4.
Also added support for the '*' wildcard name (This used to be commit 2dd7ccf72444db668fa970c3a95de1448baea224)
Diffstat (limited to 'source4/librpc/ndr')
-rw-r--r--source4/librpc/ndr/ndr_basic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c
index e38b9d394a..61b3c9ec4d 100644
--- a/source4/librpc/ndr/ndr_basic.c
+++ b/source4/librpc/ndr/ndr_basic.c
@@ -887,7 +887,7 @@ NTSTATUS ndr_push_string(struct ndr_push *ndr, int ndr_flags, const char *s)
d_len = (flags & LIBNDR_FLAG_STR_FIXLEN32)?32:15;
NDR_PUSH_NEED_BYTES(ndr, byte_mul*d_len);
ret = convert_string(CH_UNIX, chset,
- s, s_len + 1,
+ s, s_len,
ndr->data+ndr->offset, byte_mul*d_len);
if (ret == -1) {
return ndr_push_error(ndr, NDR_ERR_CHARCNV,