summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-05-30 18:40:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:19 -0500
commit46e5fda0ad956c1b6524d89b9317b8ad35043c69 (patch)
tree55b6559eb65dd65df0253eff7f84f6ba767587b9
parentd089ecb5b6bd2ed6a2232ccaf9d7471d256c9ea2 (diff)
downloadsamba-46e5fda0ad956c1b6524d89b9317b8ad35043c69.tar.gz
samba-46e5fda0ad956c1b6524d89b9317b8ad35043c69.tar.bz2
samba-46e5fda0ad956c1b6524d89b9317b8ad35043c69.zip
r7119: the content of a subcontext can contain deferred data,
but for the caller a subcontext is like a scalar... the first point is more important and is fixed with this commit, however it would be nice if we could make them look like scalars to the callers later metze (This used to be commit 8a16aa6401ff57624e35b785b8f6a6acda56ea1f)
-rw-r--r--source4/build/pidl/ndr.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/build/pidl/ndr.pm b/source4/build/pidl/ndr.pm
index 09b2f0f257..876fbc247c 100644
--- a/source4/build/pidl/ndr.pm
+++ b/source4/build/pidl/ndr.pm
@@ -179,7 +179,7 @@ sub can_contain_deferred
return 1 if ($e->{POINTERS});
return 0 if (typelist::is_scalar($e->{TYPE}));
- return 0 if (defined(util::has_property($e, "subcontext")));
+ return 1 if (defined(util::has_property($e, "subcontext")));
return 1 unless (typelist::hasType($e->{TYPE})); # assume the worst
my $type = typelist::getType($e->{TYPE});