summaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorEmmanuel Raviart <eraviart@entrouvert.com>2004-08-04 05:49:35 +0000
committerEmmanuel Raviart <eraviart@entrouvert.com>2004-08-04 05:49:35 +0000
commitc2efacf298be865314282120002b1769c8752238 (patch)
treef859ffa57dd0d0436c08385086712c7081fe0d79 /python
parent1672a77f98986d3a793e51ba8b364c097182439e (diff)
downloadlasso-c2efacf298be865314282120002b1769c8752238.tar.gz
lasso-c2efacf298be865314282120002b1769c8752238.tar.xz
lasso-c2efacf298be865314282120002b1769c8752238.zip
In Python, Server.add_provider now returns an error code instead of None.
Diffstat (limited to 'python')
-rw-r--r--python/environs/py_server.c16
-rw-r--r--python/lasso.py4
2 files changed, 10 insertions, 10 deletions
diff --git a/python/environs/py_server.c b/python/environs/py_server.c
index 5f804223..4a0c0449 100644
--- a/python/environs/py_server.c
+++ b/python/environs/py_server.c
@@ -81,22 +81,22 @@ PyObject *server_new_from_dump(PyObject *self, PyObject *args) {
PyObject *server_add_provider(PyObject *self, PyObject *args) {
PyObject *server_obj;
- gchar *metadata;
- gchar *public_key = NULL;
- gchar *ca_certificat = NULL;
+ gchar *metadata;
+ gchar *public_key = NULL;
+ gchar *ca_certificate = NULL;
+ gint ret;
if (CheckArgs(args, "OSss:server_add_provider")) {
if(!PyArg_ParseTuple(args, (char *) "Oszz:server_add_provider",
- &server_obj, &metadata, &public_key, &ca_certificat))
+ &server_obj, &metadata, &public_key, &ca_certificate))
return NULL;
}
else return NULL;
- lasso_server_add_provider(LassoServer_get(server_obj),
- metadata, public_key, ca_certificat);
+ ret = lasso_server_add_provider(LassoServer_get(server_obj),
+ metadata, public_key, ca_certificate);
- Py_INCREF(Py_None);
- return (Py_None);
+ return (int_wrap(ret));
}
PyObject *server_destroy(PyObject *self, PyObject *args) {
diff --git a/python/lasso.py b/python/lasso.py
index 8c40c071..d46ce02f 100644
--- a/python/lasso.py
+++ b/python/lasso.py
@@ -813,8 +813,8 @@ class Server:
new_from_dump = classmethod(new_from_dump)
def add_provider(self, metadata, public_key=None, certificate=None):
- lassomod.server_add_provider(self, metadata,
- public_key, certificate)
+ return lassomod.server_add_provider(self, metadata,
+ public_key, certificate)
def dump(self):
return lassomod.server_dump(self)