diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2008-04-24 09:02:34 +0000 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2008-04-24 09:02:34 +0000 |
| commit | cc5109ee93fa27a688d290390cfc564fa3743b83 (patch) | |
| tree | 04012483f45d3423fce1d0946b238275fecbcb94 | |
| parent | e7a598832bcfdd302a3be99a3112e355e465ae9c (diff) | |
change g_return_val_if_fail(provider,... from last commit to g_return_val_if_fail(LASSO_IS_PROVIDER(provider)
| -rw-r--r-- | lasso/id-ff/provider.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c index 73b47a18..ee01a248 100644 --- a/lasso/id-ff/provider.c +++ b/lasso/id-ff/provider.c @@ -76,7 +76,7 @@ lasso_provider_get_assertion_consumer_service_url(LassoProvider *provider, const char *sid = (char*)service_id; char *name; - g_return_val_if_fail(provider, NULL); + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), NULL); if (sid == NULL) sid = provider->private_data->default_assertion_consumer; @@ -109,7 +109,7 @@ lasso_provider_get_metadata_one(LassoProvider *provider, const char *name) GList *l; GHashTable *descriptor; - g_return_val_if_fail(provider, NULL); + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), NULL); descriptor = provider->private_data->SPDescriptor; /* default to SP */ if (provider->role == LASSO_PROVIDER_ROLE_IDP) descriptor = provider->private_data->IDPDescriptor; @@ -140,7 +140,7 @@ lasso_provider_get_metadata_list(LassoProvider *provider, const char *name) { GHashTable *descriptor; - g_return_val_if_fail(provider, NULL); + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), NULL); descriptor = provider->private_data->SPDescriptor; /* default to SP */ if (provider->role == LASSO_PROVIDER_ROLE_IDP) descriptor = provider->private_data->IDPDescriptor; @@ -170,7 +170,7 @@ lasso_provider_get_first_http_method(LassoProvider *provider, GList *t1, *t2 = NULL; gboolean found; - g_return_val_if_fail(provider, LASSO_HTTP_METHOD_NONE); + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), LASSO_HTTP_METHOD_NONE); if (provider->private_data->conformance == LASSO_PROTOCOL_SAML_2_0) { return lasso_saml20_provider_get_first_http_method( provider, remote_provider, protocol_type); @@ -238,7 +238,7 @@ lasso_provider_accept_http_method(LassoProvider *provider, LassoProvider *remote LassoProviderRole initiating_role; char *protocol_profile; - g_return_val_if_fail(provider, FALSE); // Be conservative + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), FALSE); // Be conservative if (provider->private_data->conformance == LASSO_PROTOCOL_SAML_2_0) { return lasso_saml20_provider_accept_http_method( provider, remote_provider, protocol_type, @@ -293,7 +293,7 @@ lasso_provider_has_protocol_profile(LassoProvider *provider, { GList *supported; - g_return_val_if_fail(provider, FALSE); // Be conservative + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), FALSE); // Be conservative supported = lasso_provider_get_metadata_list( provider, protocol_md_nodename[protocol_type]); @@ -316,7 +316,7 @@ lasso_provider_get_base64_succinct_id(LassoProvider *provider) { char *succinct_id, *base64_succinct_id; - g_return_val_if_fail(provider, NULL); + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), NULL); succinct_id = lasso_sha1(provider->ProviderID); base64_succinct_id = (char*)xmlSecBase64Encode((xmlChar*)succinct_id, 20, 0); xmlFree(succinct_id); @@ -336,7 +336,7 @@ lasso_provider_get_base64_succinct_id(LassoProvider *provider) xmlNode* lasso_provider_get_organization(LassoProvider *provider) { - g_return_val_if_fail(provider, NULL); + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), NULL); if (provider->private_data->organization) { return xmlCopyNode(provider->private_data->organization, 1); } else { @@ -362,7 +362,7 @@ static LassoNodeClass *parent_class = NULL; xmlSecKey* lasso_provider_get_public_key(LassoProvider *provider) { - g_return_val_if_fail(provider, NULL); + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), NULL); return provider->private_data->public_key; } @@ -664,7 +664,7 @@ lasso_provider_get_type() LassoProtocolConformance lasso_provider_get_protocol_conformance(LassoProvider *provider) { - g_return_val_if_fail(provider, LASSO_PROTOCOL_NONE); + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), LASSO_PROTOCOL_NONE); return provider->private_data->conformance; } @@ -679,7 +679,7 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata) const char *xpath_sp = "/md:EntityDescriptor/md:SPDescriptor"; const char *xpath_organization = "/md:EntityDescriptor/md:Organization"; - g_return_val_if_fail(provider, FALSE); + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), FALSE); doc = xmlParseFile(metadata); if (doc == NULL) return FALSE; @@ -836,7 +836,7 @@ lasso_provider_load_public_key(LassoProvider *provider, LassoPublicKeyType publi }; int i; - g_return_val_if_fail(provider, FALSE); + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), FALSE); if (public_key_type == LASSO_PUBLIC_KEY_SIGNING) { public_key = provider->public_key; key_descriptor = provider->private_data->signing_key_descriptor; @@ -976,7 +976,7 @@ lasso_provider_verify_signature(LassoProvider *provider, xmlXPathContext *xpathCtx = NULL; xmlXPathObject *xpathObj = NULL; - g_return_val_if_fail(provider, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); + g_return_val_if_fail(LASSO_IS_PROVIDER(provider), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); msg = (char*)message; if (message == NULL) @@ -1125,7 +1125,7 @@ lasso_provider_verify_signature(LassoProvider *provider, void lasso_provider_set_encryption_mode(LassoProvider *provider, LassoEncryptionMode encryption_mode) { - g_return_if_fail(provider); + g_return_if_fail(LASSO_IS_PROVIDER(provider)); provider->private_data->encryption_mode = encryption_mode; } @@ -1140,6 +1140,6 @@ void lasso_provider_set_encryption_sym_key_type(LassoProvider *provider, LassoEncryptionSymKeyType encryption_sym_key_type) { - g_return_if_fail(provider); + g_return_if_fail(LASSO_IS_PROVIDER(provider)); provider->private_data->encryption_sym_key_type = encryption_sym_key_type; } |
