diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-31 04:15:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:24 -0500 |
| commit | aa985bdee09e222f9f3f1f49e1cc20e0760c6f32 (patch) | |
| tree | 06a1196ade27f619759e53e23fb3fbe9c83121d0 /source4/librpc | |
| parent | 5e6082b4b0e8d47d8634cf1b0c5bb460d0b6dbd1 (diff) | |
| download | samba-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')
| -rw-r--r-- | source4/librpc/idl/nbt.idl | 4 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_basic.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/librpc/idl/nbt.idl b/source4/librpc/idl/nbt.idl index 35fc7d90c4..caca7fa336 100644 --- a/source4/librpc/idl/nbt.idl +++ b/source4/librpc/idl/nbt.idl @@ -139,8 +139,8 @@ interface nbt nb_flags nb_flags; } nbt_status_name; - typedef [gensize] struct { - [value(ndr_size_nbt_rdata_status(r, ndr->flags)-2)] uint16 length; + typedef struct { + [value(r->num_names * 18 + 47)] uint16 length; uint8 num_names; nbt_status_name names[num_names]; nbt_statistics statistics; 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, |