Author: ArcRiley
Date: 2009-03-05 14:30:36 -0500 (Thu, 05 Mar 2009)
New Revision: 1553
Modified:
trunk/concordance/src/_core/__init__.c
trunk/concordance/src/_core/step.c
Log:
exceptions from sasl callbacks getting passed through correctly now
Modified: trunk/concordance/src/_core/__init__.c
===================================================================
--- trunk/concordance/src/_core/__init__.c 2009-03-05 18:31:19 UTC (rev
1552)
+++ trunk/concordance/src/_core/__init__.c 2009-03-05 19:30:36 UTC (rev
1553)
@@ -121,7 +121,7 @@
/* check for exception from sasl handler */
if (!out)
- return GSASL_NO_SERVER_CODE;
+ return GSASL_NO_CALLBACK;
/* for validation handlers, check for True or False */
if (boo) {
@@ -139,7 +139,7 @@
val = g_strdup_printf("expected string from %s handler", met);
PyErr_SetString(PyExc_TypeError, met);
g_free(val);
- return GSASL_NO_SERVER_CODE;
+ return GSASL_NO_CALLBACK;
}
val = concordPyUnicodeToUTF8(out);
gsasl_property_set(msg->sctx, prop, val);
Modified: trunk/concordance/src/_core/step.c
===================================================================
--- trunk/concordance/src/_core/step.c 2009-03-05 18:31:19 UTC (rev 1552)
+++ trunk/concordance/src/_core/step.c 2009-03-05 19:30:36 UTC (rev 1553)
@@ -228,9 +228,9 @@
status = gsasl_step64(msg->sctx, msg->inpt->str, &output);
/* break here if Python callback raised an exception */
- if (status == GSASL_NO_SERVER_CODE)
+ if (PyErr_Occurred())
BREAKNULL
-
+
switch (status) {
case GSASL_OK : {
element = "success";
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
