summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-05-30 11:25:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:16 -0500
commit5e83b577c9d509b49f0bb8b056a1f96ba0d29f20 (patch)
tree0c0029819989272bd3159282227c1c6c7d18edf1
parentb77ba6e4d40f6c9681a1be88cee8a59075331645 (diff)
downloadsamba-5e83b577c9d509b49f0bb8b056a1f96ba0d29f20.tar.gz
samba-5e83b577c9d509b49f0bb8b056a1f96ba0d29f20.tar.bz2
samba-5e83b577c9d509b49f0bb8b056a1f96ba0d29f20.zip
r7102: fix subcontext(0)
metze (This used to be commit 81c878b7b2e0cb5f4c042fab4d27953c3ef1e9c9)
-rw-r--r--source4/build/pidl/ndr.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/build/pidl/ndr.pm b/source4/build/pidl/ndr.pm
index 5fafab3cd0..febf292c8a 100644
--- a/source4/build/pidl/ndr.pm
+++ b/source4/build/pidl/ndr.pm
@@ -132,7 +132,8 @@ sub GetElementLevelTable($)
}
}
- if (my $hdr_size = util::has_property($e, "subcontext")) {
+ if (defined(util::has_property($e, "subcontext"))) {
+ my $hdr_size = util::has_property($e, "subcontext");
my $subsize = util::has_property($e, "subcontext_size");
if (not defined($subsize)) {
$subsize = -1;
@@ -178,7 +179,7 @@ sub can_contain_deferred
return 1 if ($e->{POINTERS});
return 0 if (typelist::is_scalar($e->{TYPE}));
- return 0 if (util::has_property($e, "subcontext"));
+ return 0 if (defined(util::has_property($e, "subcontext")));
return 1 unless (typelist::hasType($e->{TYPE})); # assume the worst
my $type = typelist::getType($e->{TYPE});