diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-15 15:27:21 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-15 15:27:21 +0100 |
| commit | 26bc88eabac66423218809513c386635521dce5b (patch) | |
| tree | 194eaad3479021f5c70ffa158898983429442fa7 /source4/librpc/idl/epmapper.idl | |
| parent | 6c4acbbf9ee0f92ed614d872686426897dbe26bc (diff) | |
| parent | 9d9d54430aed677ae33e51fda5da7b4306c734f1 (diff) | |
| download | samba-26bc88eabac66423218809513c386635521dce5b.tar.gz samba-26bc88eabac66423218809513c386635521dce5b.tar.bz2 samba-26bc88eabac66423218809513c386635521dce5b.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
Conflicts:
source/torture/libnet/libnet_BecomeDC.c
(This used to be commit 2da0734f439ee5f4e3eb1c9416e7df4450f08534)
Diffstat (limited to 'source4/librpc/idl/epmapper.idl')
| -rw-r--r-- | source4/librpc/idl/epmapper.idl | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source4/librpc/idl/epmapper.idl b/source4/librpc/idl/epmapper.idl index baf9f23877..60ff338ec4 100644 --- a/source4/librpc/idl/epmapper.idl +++ b/source4/librpc/idl/epmapper.idl @@ -3,6 +3,7 @@ /* endpoint mapper interface Related links: + http://www.opengroup.org/onlinepubs/9629399/apdxo.htm : The official IDL for this pipe http://www.opengroup.org/onlinepubs/9629399/apdxl.htm : Details on towers http://www.opengroup.org/onlinepubs/9629399/chap6.htm#tagcjh_11_02_03_01: binding strings @@ -222,7 +223,16 @@ interface epmapper typedef struct { GUID object; epm_twr_t *tower; - ascstr2 annotation; + /* + * In theory this should be: + * [charset(DOS),string] uint8 annotation[64] + * But midl treats this as: + * [charset(DOS),string] uint8 annotation[] + * and pidl doesn't support this yet + */ + [value(0)] uint32 __annotation_offset; + [value(strlen(annotation)+1)] uint32 __annotation_length; + [charset(DOS)] uint8 annotation[__annotation_length]; } epm_entry_t; typedef struct { |