summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-10-06 20:07:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:39:29 -0500
commit0ef04670398f27d36bf9dabf39a925a2ba2b29d0 (patch)
tree39bcf7ff7e29c3385320bc7c0f87b134e0c4399c
parentf7cd569828c87a2c4f07b8629878c367b63acf71 (diff)
downloadsamba-0ef04670398f27d36bf9dabf39a925a2ba2b29d0.tar.gz
samba-0ef04670398f27d36bf9dabf39a925a2ba2b29d0.tar.bz2
samba-0ef04670398f27d36bf9dabf39a925a2ba2b29d0.zip
r10787: Fix silly nodiscriminant-issue
(This used to be commit 43a5c863bf81af9b8415b6ccf8a386c36d4fa7f9)
-rw-r--r--source4/pidl/TODO4
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm2
2 files changed, 5 insertions, 1 deletions
diff --git a/source4/pidl/TODO b/source4/pidl/TODO
index 1f5875aebe..9fc3a7d904 100644
--- a/source4/pidl/TODO
+++ b/source4/pidl/TODO
@@ -10,3 +10,7 @@
a (regular) remote error occurs
- support nested elements
+
+- Don't output [ref] pointers for Samba 4?
+
+- alternative to subcontext()
diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm
index 7cd1255a40..eaab50b553 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm
@@ -394,7 +394,7 @@ sub ParseUnion($$$)
indent;
DeclareArrayVariables($u->{ELEMENTS});
- if (has_property($u, "nodiscriminant")) {
+ unless (has_property($u, "nodiscriminant")) {
pidl "if (!prs_uint32(\"switch_value\", ps, depth, &v->switch_value))";
pidl "\treturn False;";
pidl "";