From 0322fbdb90ffecfd9ee91533cb057fa71c4a73a8 Mon Sep 17 00:00:00 2001
From: fpeters <>
Date: Wed, 8 Sep 2004 11:28:35 +0000
Subject: [PATCH] remove federation is now called from within lasso; why is
 this still part of lasso API ?

---
 src/federation_termination.c | 28 ++--------------------------
 src/soap_end_point.c         | 16 ----------------
 2 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/src/federation_termination.c b/src/federation_termination.c
index e9a45e1..12d3142 100644
--- a/src/federation_termination.c
+++ b/src/federation_termination.c
@@ -46,16 +46,9 @@ int defederation_http(LassoDefederation *termination)
 		return error_page("set_profile_auto failed");
 	}
 
-	identity = lasso_profile_get_identity(LASSO_PROFILE(termination));
-	if (identity == NULL) {
-		return error_page("get_itentity failed");
-	}
-
-	rc = lasso_identity_remove_federation(identity,
-			LASSO_PROFILE(termination)->remote_providerID);
-	lasso_identity_destroy(identity);
+	rc = lasso_defederation_build_notification_msg(termination);
 	if (rc) {
-		return error_page("remove_federation failed");
+		return error_page("build notification msg");
 	}
 
 	rc = save_profile_dumps(LASSO_PROFILE(termination));
@@ -63,11 +56,6 @@ int defederation_http(LassoDefederation *termination)
 		return error_page("save_profile_dumps failed");
 	}
 
-	rc = lasso_defederation_build_notification_msg(termination);
-	if (rc) {
-		return error_page("build notification msg");
-	}
-
 	printf("Location: %s\n\nRedirected",
 			LASSO_PROFILE(termination)->msg_url);
 
@@ -130,18 +118,6 @@ int defederation_init(LassoDefederation *termination,
 		return error_page("init_notification failed");
 	}
 
-	identity = lasso_profile_get_identity(LASSO_PROFILE(termination));
-	if (identity == NULL) {
-		return error_page("get_identity failed");
-	}
-
-	rc = lasso_identity_remove_federation(identity,
-			LASSO_PROFILE(termination)->remote_providerID);
-	lasso_identity_destroy(identity);
-	if (rc) {
-		return error_page("remove_federation failed");
-	}
-
 	rc = save_profile_dumps(LASSO_PROFILE(termination));
 	if (rc) {
 		return error_page("save_profile_dumps failed");
diff --git a/src/soap_end_point.c b/src/soap_end_point.c
index 178c3fc..9967b18 100644
--- a/src/soap_end_point.c
+++ b/src/soap_end_point.c
@@ -198,22 +198,6 @@ char* req_defederation(LassoServer *server, char *soap_msg)
 		return NULL;
 	}
 
-	identity = lasso_profile_get_identity(LASSO_PROFILE(termination));
-	if (identity == NULL) {
-		fprintf(stderr, "lasso_profile_get_identity failed\n");
-		lasso_defederation_destroy(termination);
-		return NULL;
-	}
-		
-	rc = lasso_identity_remove_federation(identity,
-			LASSO_PROFILE(termination)->remote_providerID);
-	lasso_identity_destroy(identity);
-	if (rc) {
-		fprintf(stderr, "remove_federation failed\n");
-		lasso_defederation_destroy(termination);
-		return NULL;
-	}
-
 	rc = save_profile_dumps(LASSO_PROFILE(termination));
 	if (rc) {
 		lasso_defederation_destroy(termination);