*** empty log message ***

5 files changed, 20 insertions, 20 deletions

diff --git a/lasso/Attic/protocols/logout_request.c b/lasso/Attic/protocols/logout_request.c
index 52f254af..d570a83c 100644
--- a/lasso/Attic/protocols/logout_request.c
+++ b/lasso/Attic/protocols/logout_request.c
@@ -77,6 +77,8 @@ lasso_logout_request_new(const xmlChar *providerID,
 
   g_return_val_if_fail(providerID != NULL, NULL);
   g_return_val_if_fail(nameIdentifier != NULL, NULL);
+  g_return_val_if_fail(nameQualifier != NULL, NULL);
+  g_return_val_if_fail(format != NULL, NULL);
 
   request = LASSO_NODE(g_object_new(LASSO_TYPE_LOGOUT_REQUEST, NULL));
   
@@ -98,12 +100,10 @@ lasso_logout_request_new(const xmlChar *providerID,
 					 providerID);
 
   identifier = lasso_saml_name_identifier_new(nameIdentifier);
-  if (nameQualifier != NULL)
-    lasso_saml_name_identifier_set_nameQualifier(LASSO_SAML_NAME_IDENTIFIER(identifier),
-						 nameQualifier);
-  if (format != NULL)
-    lasso_saml_name_identifier_set_format(LASSO_SAML_NAME_IDENTIFIER(identifier),
-					  format);
+  lasso_saml_name_identifier_set_nameQualifier(LASSO_SAML_NAME_IDENTIFIER(identifier),
+					       nameQualifier);
+  lasso_saml_name_identifier_set_format(LASSO_SAML_NAME_IDENTIFIER(identifier),
+					format);
 
   lasso_lib_logout_request_set_nameIdentifier(LASSO_LIB_LOGOUT_REQUEST(request),
 					      LASSO_SAML_NAME_IDENTIFIER(identifier));
diff --git a/lasso/Attic/protocols/name_identifier_mapping_request.c b/lasso/Attic/protocols/name_identifier_mapping_request.c
index 6837856c..a3d201ff 100644
--- a/lasso/Attic/protocols/name_identifier_mapping_request.c
+++ b/lasso/Attic/protocols/name_identifier_mapping_request.c
@@ -77,6 +77,8 @@ lasso_name_identifier_mapping_request_new(const xmlChar *providerID,
 
   g_return_val_if_fail(providerID != NULL, NULL);
   g_return_val_if_fail(nameIdentifier != NULL, NULL);
+  g_return_val_if_fail(nameQualifier != NULL, NULL);
+  g_return_val_if_fail(format != NULL, NULL);
 
   request = LASSO_NODE(g_object_new(LASSO_TYPE_NAME_IDENTIFIER_MAPPING_REQUEST, NULL));
   
@@ -98,12 +100,10 @@ lasso_name_identifier_mapping_request_new(const xmlChar *providerID,
 							   providerID);
 
   identifier = lasso_saml_name_identifier_new(nameIdentifier);
-  if (nameQualifier != NULL)
-    lasso_saml_name_identifier_set_nameQualifier(LASSO_SAML_NAME_IDENTIFIER(identifier),
-						 nameQualifier);
-  if (format != NULL)
-    lasso_saml_name_identifier_set_format(LASSO_SAML_NAME_IDENTIFIER(identifier),
-					  format);
+  lasso_saml_name_identifier_set_nameQualifier(LASSO_SAML_NAME_IDENTIFIER(identifier),
+					       nameQualifier);
+  lasso_saml_name_identifier_set_format(LASSO_SAML_NAME_IDENTIFIER(identifier),
+					format);
 
   lasso_lib_name_identifier_mapping_request_set_nameIdentifier(LASSO_LIB_NAME_IDENTIFIER_MAPPING_REQUEST(request),
 							       LASSO_SAML_NAME_IDENTIFIER(identifier));
diff --git a/python/lasso.py b/python/lasso.py
index c8e8ca27..c15d9e4f 100644
--- a/python/lasso.py
+++ b/python/lasso.py
@@ -299,8 +299,8 @@ class FederationTerminationNotification(LibFederationTerminationNotification):
 
 
 class LogoutRequest(LibLogoutRequest):
-    def __init__(self, providerID, nameIdentifier,
-                 nameQualifier=None, format=None, _obj=None):
+    def __init__(self, providerID, nameIdentifier, nameQualifier, format,
+                 _obj=None):
         """
         """
         if _obj != None:
@@ -328,8 +328,8 @@ class LogoutResponse(Node):
 
 
 class NameIdentifierMappingRequest(LibNameIdentifierMappingRequest):
-    def __init__(self, providerID, nameIdentifier,
-                 nameQualifier=None, format=None, _obj=None):
+    def __init__(self, providerID, nameIdentifier, nameQualifier, format,
+                 _obj=None):
         """
         """
         if _obj != None:
diff --git a/python/protocols/py_logout_request.c b/python/protocols/py_logout_request.c
index 86e9d282..e6ead2ea 100644
--- a/python/protocols/py_logout_request.c
+++ b/python/protocols/py_logout_request.c
@@ -49,8 +49,8 @@ PyObject *logout_request_new(PyObject *self, PyObject *args) {
 
   LassoNode *request;
 
-  if (CheckArgs(args, "SSss:logout_request_new")) {
-    if(!PyArg_ParseTuple(args, (char *) "sszz:logout_request_new",
+  if (CheckArgs(args, "SSSS:logout_request_new")) {
+    if(!PyArg_ParseTuple(args, (char *) "ssss:logout_request_new",
 			 &providerID, &nameIdentifier, &nameQualifier, &format))
       return NULL;
   }
diff --git a/python/protocols/py_name_identifier_mapping_request.c b/python/protocols/py_name_identifier_mapping_request.c
index bcc02cab..1d287fc8 100644
--- a/python/protocols/py_name_identifier_mapping_request.c
+++ b/python/protocols/py_name_identifier_mapping_request.c
@@ -49,8 +49,8 @@ PyObject *name_identifier_mapping_request_new(PyObject *self, PyObject *args) {
 
   LassoNode *request;
 
-  if (CheckArgs(args, "SSss:name_identifier_mapping_request_new")) {
-    if(!PyArg_ParseTuple(args, (char *) "sszz:name_identifier_mapping_request_new",
+  if (CheckArgs(args, "SSSS:name_identifier_mapping_request_new")) {
+    if(!PyArg_ParseTuple(args, (char *) "ssss:name_identifier_mapping_request_new",
 			 &providerID, &nameIdentifier,
 			 &nameQualifier, &format))
       return NULL;