summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2004-09-19 22:22:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:50 -0500
commitfa8c1abcc833953d69f732d3577d6492148121a7 (patch)
treee3f4ec6fb0a0bf180be793bb233949f0586611da
parent6feaf61b61d8f76faeab176af79e1d6e6bea419f (diff)
downloadsamba-fa8c1abcc833953d69f732d3577d6492148121a7.tar.gz
samba-fa8c1abcc833953d69f732d3577d6492148121a7.tar.bz2
samba-fa8c1abcc833953d69f732d3577d6492148121a7.zip
r2421: Fix test for lookupdomain for a non-existent domain.
Export NTSTATUS exception from wrapper module so it can be used by scripts. (This used to be commit 57edfd605bffcf8a0feb5ccc5ec69cf5f35b677b)
-rw-r--r--source4/scripting/swig/dcerpc.i9
-rwxr-xr-xsource4/scripting/swig/torture/samr.py8
2 files changed, 15 insertions, 2 deletions
diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index a90ac90b5a..bded875b10 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -1,3 +1,5 @@
+/* Tastes like -*- C -*- */
+
/*
Unix SMB/CIFS implementation.
@@ -227,11 +229,16 @@ PyObject *string_ptr_to_python(TALLOC_CTX *mem_ctx, char *obj)
%include "samba.i"
+%pythoncode %{
+ NTSTATUS = _dcerpc.NTSTATUS
+%}
+
%init %{
setup_logging("python", DEBUG_STDOUT);
lp_load(dyn_CONFIGFILE, True, False, False);
load_interfaces();
- ntstatus_exception = PyErr_NewException("dcerpc.NTSTATUS", NULL, NULL);
+ ntstatus_exception = PyErr_NewException("_dcerpc.NTSTATUS", NULL, NULL);
+ PyDict_SetItemString(d, "NTSTATUS", ntstatus_exception);
%}
%typemap(in, numinputs=0) struct dcerpc_pipe **OUT (struct dcerpc_pipe *temp_dcerpc_pipe) {
diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index 00e4db1958..1f3b60eed4 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -90,7 +90,13 @@ def test_LookupDomain(pipe, handle, domain):
result = dcerpc.samr_LookupDomain(pipe, r)
- print result
+ r['domain']['name'] = 'xxNODOMAINxx'
+
+ try:
+ result = dcerpc.samr_LookupDomain(pipe, r)
+ except dcerpc.NTSTATUS, arg:
+ if arg[0] != 0xc00000df:
+ raise dcerpc.NTSTATUS(arg)
def test_EnumDomains(pipe, handle):