summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2004-10-31 05:46:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:06 -0500
commit12fb5bc0cbc8b3180d8319a169611945ae42a242 (patch)
tree7a5e494caad7bbd34be1ad3ee67e01398c783ac1 /source4
parent5d7c6d7bbdbf9e796fa4d21aa47f177b6c81367e (diff)
downloadsamba-12fb5bc0cbc8b3180d8319a169611945ae42a242.tar.gz
samba-12fb5bc0cbc8b3180d8319a169611945ae42a242.tar.bz2
samba-12fb5bc0cbc8b3180d8319a169611945ae42a242.zip
r3406: Don't throw a werror exception for WERR_NO_MORE_ITEMS and WERR_MORE_DATA.
(This used to be commit deaa5159f41a8841d75801b441e7bd5cf2636870)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/pidl/swig.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/build/pidl/swig.pm b/source4/build/pidl/swig.pm
index 922ee16f6f..20b658b19f 100644
--- a/source4/build/pidl/swig.pm
+++ b/source4/build/pidl/swig.pm
@@ -358,7 +358,9 @@ sub ParseFunction($)
if (!($fn->{RETURN_TYPE} eq "NTSTATUS")) {
$result .= "\tif (!W_ERROR_IS_OK(arg3->out.result) && \n";
- $result .= "\t\t!(W_ERROR_EQUAL(arg3->out.result, WERR_INSUFFICIENT_BUFFER))) {\n";
+ $result .= "\t\t!(W_ERROR_EQUAL(arg3->out.result, WERR_INSUFFICIENT_BUFFER)) &&\n";
+ $result .= "\t\t!(W_ERROR_EQUAL(arg3->out.result, WERR_NO_MORE_ITEMS)) &&\n";
+ $result .= "\t\t!(W_ERROR_EQUAL(arg3->out.result, WERR_MORE_DATA))) {\n";
$result .= "\t\tset_werror_exception(W_ERROR_V(arg3->out.result));\n";
$result .= "\t\tgoto fail;\n";
$result .= "\t}\n";