diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-11-23 13:11:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:28:25 -0500 |
| commit | 203550d0325d6f2176430ecad5c321b1f9d323b6 (patch) | |
| tree | dd5ab84e7a45ae8b2680e0a11df73cd19acdac66 /source4 | |
| parent | 68ebe2572406aaf7f61cd0b51fd02b5c11502a80 (diff) | |
| download | samba-203550d0325d6f2176430ecad5c321b1f9d323b6.tar.gz samba-203550d0325d6f2176430ecad5c321b1f9d323b6.tar.bz2 samba-203550d0325d6f2176430ecad5c321b1f9d323b6.zip | |
r19854: readd support for 'sptr' pointers, to work against windows servers
until jelmer commits his 'ptr' support
metze
(This used to be commit f5aa620b1bc5b0da866cbdb71947ef25a4bae0ad)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/NDR.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm index ef27c7141f..9048a25684 100644 --- a/source4/pidl/lib/Parse/Pidl/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/NDR.pm @@ -310,6 +310,7 @@ sub pointer_type($) return "ref" if (has_property($e, "ref")); return "ptr" if (has_property($e, "ptr")); + return "sptr" if (has_property($e, "sptr")); return "unique" if (has_property($e, "unique")); return "relative" if (has_property($e, "relative")); return "ignore" if (has_property($e, "ignore")); @@ -1055,10 +1056,10 @@ sub ValidInterface($) if (has_property($interface, "pointer_default")) { if ($interface->{PROPERTIES}->{pointer_default} eq "ptr") { - nonfatal $interface, "Full pointers are not supported yet, falling back to unique"; - $interface->{PROPERTIES}->{pointer_default} = "unique"; + nonfatal $interface, "Full pointers are not supported yet, falling back to sptr"; + $interface->{PROPERTIES}->{pointer_default} = "sptr"; } elsif (not grep (/$interface->{PROPERTIES}->{pointer_default}/, - ("ref", "unique", "ptr"))) { + ("ref", "unique", "ptr", "sptr"))) { fatal $interface, "Unknown default pointer type `$interface->{PROPERTIES}->{pointer_default}'"; } } |