Author: jelmer Date: 2007-11-21 13:47:28 +0000 (Wed, 21 Nov 2007) New Revision: 26091
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26091 Log: Fold samba.i into errors.i Removed: branches/4.0-python/source/scripting/swig/samba.i Modified: branches/4.0-python/ branches/4.0-python/source/libcli/util/errors.i Changeset: Property changes on: branches/4.0-python ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/4.0-python/source/libcli/util/errors.i =================================================================== --- branches/4.0-python/source/libcli/util/errors.i 2007-11-21 13:37:20 UTC (rev 26090) +++ branches/4.0-python/source/libcli/util/errors.i 2007-11-21 13:47:28 UTC (rev 26091) @@ -36,4 +36,15 @@ } }; +%typemap(in) NTSTATUS { + if (PyLong_Check($input)) + $1 = NT_STATUS(PyLong_AsUnsignedLong($input)); + else if (PyInt_Check($input)) + $1 = NT_STATUS(PyInt_AsLong($input)); + else { + PyErr_SetString(PyExc_TypeError, "Expected a long or an int"); + return NULL; + } +} + #endif Deleted: branches/4.0-python/source/scripting/swig/samba.i =================================================================== --- branches/4.0-python/source/scripting/swig/samba.i 2007-11-21 13:37:20 UTC (rev 26090) +++ branches/4.0-python/source/scripting/swig/samba.i 2007-11-21 13:47:28 UTC (rev 26091) @@ -1,57 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - Common swig definitions - - Copyright (C) 2004 Tim Potter <[EMAIL PROTECTED]> - - ** NOTE! The following LGPL license applies to the swig - ** definitions. This does NOT imply that all of Samba is released - ** under the LGPL - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 3 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, see <http://www.gnu.org/licenses/>. -*/ - -%typemap(in) NTSTATUS { - if (PyLong_Check($input)) - $1 = NT_STATUS(PyLong_AsUnsignedLong($input)); - else if (PyInt_Check($input)) - $1 = NT_STATUS(PyInt_AsLong($input)); - else { - PyErr_SetString(PyExc_TypeError, "Expected a long or an int"); - return NULL; - } -} - -%typemap(in) struct cli_credentials * { - $1 = cli_credentials_init(arg1); - if ($input == Py_None) { - cli_credentials_set_anonymous($1); - } else { - if (!PyTuple_Check($input) || - PyTuple_Size($input) != 3) { - PyErr_SetString(PyExc_TypeError, "Expecting three element tuple"); - return NULL; - } - if (!PyString_Check(PyTuple_GetItem($input, 0)) || - !PyString_Check(PyTuple_GetItem($input, 1)) || - !PyString_Check(PyTuple_GetItem($input, 2))) { - PyErr_SetString(PyExc_TypeError, "Expecting string elements"); - return NULL; - } - cli_credentials_set_domain($1, PyString_AsString(PyTuple_GetItem($input, 0)), CRED_SPECIFIED); - cli_credentials_set_username($1, PyString_AsString(PyTuple_GetItem($input, 1)), CRED_SPECIFIED); - cli_credentials_set_password($1, PyString_AsString(PyTuple_GetItem($input, 2)), CRED_SPECIFIED); - } -}
