summaryrefslogtreecommitdiffstats
path: root/lasso
diff options
context:
space:
mode:
authorFrederic Peters <fpeters@entrouvert.com>2005-01-12 14:12:47 +0000
committerFrederic Peters <fpeters@entrouvert.com>2005-01-12 14:12:47 +0000
commit5508882f0970269308da4a7ad22d3066b1a09842 (patch)
tree94b8c9e4a536f7c650acab50e27b1888baec42db /lasso
parent5f43d885271f034bb6b538c01173a75a0201d503 (diff)
downloadlasso-5508882f0970269308da4a7ad22d3066b1a09842.tar.gz
lasso-5508882f0970269308da4a7ad22d3066b1a09842.tar.xz
lasso-5508882f0970269308da4a7ad22d3066b1a09842.zip
no longer allows NULL to get the first known remote provider id
Diffstat (limited to 'lasso')
-rw-r--r--lasso/id-ff/name_identifier_mapping.c4
-rw-r--r--lasso/id-ff/name_registration.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/lasso/id-ff/name_identifier_mapping.c b/lasso/id-ff/name_identifier_mapping.c
index f1c16052..a0eb2b42 100644
--- a/lasso/id-ff/name_identifier_mapping.c
+++ b/lasso/id-ff/name_identifier_mapping.c
@@ -130,6 +130,7 @@ lasso_name_identifier_mapping_init_request(LassoNameIdentifierMapping *mapping,
g_return_val_if_fail(LASSO_IS_NAME_IDENTIFIER_MAPPING(mapping),
LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
g_return_val_if_fail(targetNamespace != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
+ g_return_val_if_fail(remote_providerID != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
profile = LASSO_PROFILE(mapping);
@@ -139,8 +140,6 @@ lasso_name_identifier_mapping_init_request(LassoNameIdentifierMapping *mapping,
}
/* set the remote provider id */
- if (remote_providerID == NULL)
- g_assert_not_reached(); /* was default; didn't make sense */
profile->remote_providerID = g_strdup(remote_providerID);
/* verify the provider type is a service provider type */
@@ -480,4 +479,3 @@ lasso_name_identifier_mapping_dump(LassoNameIdentifierMapping *mapping)
g_assert_not_reached();
return lasso_node_dump(LASSO_NODE(mapping));
}
-
diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c
index e6058d2f..1411f316 100644
--- a/lasso/id-ff/name_registration.c
+++ b/lasso/id-ff/name_registration.c
@@ -177,6 +177,7 @@ lasso_name_registration_init_request(LassoNameRegistration *name_registration,
LassoSamlNameIdentifier *spNameIdentifier, *idpNameIdentifier, *oldNameIdentifier = NULL;
g_return_val_if_fail(LASSO_IS_NAME_REGISTRATION(name_registration), -1);
+ g_return_val_if_fail(remote_providerID != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
profile = LASSO_PROFILE(name_registration);
@@ -186,9 +187,6 @@ lasso_name_registration_init_request(LassoNameRegistration *name_registration,
}
/* set the remote provider id */
- if (remote_providerID == NULL)
- g_assert_not_reached(); /* was default; didn't make sense */
-
profile->remote_providerID = g_strdup(remote_providerID);
remote_provider = g_hash_table_lookup(profile->server->providers,