From 600998355d6f42dde3bd842679bb04d91505844b Mon Sep 17 00:00:00 2001
From: fpeters <>
Date: Fri, 10 Sep 2004 09:37:11 +0000
Subject: [PATCH] updated database schema; previous one won't work anymore

---
 create-db.sql        |  4 ++--
 src/db_postgresql.c  | 14 +++++++-------
 src/idpc.h           |  4 ++--
 src/soap_end_point.c | 16 ++++++++--------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/create-db.sql b/create-db.sql
index dcf079a..e99ae4b 100644
--- a/create-db.sql
+++ b/create-db.sql
@@ -14,8 +14,8 @@
   );
   
   CREATE TABLE assertions (
-        assertion       varchar(5000),
-        response_dump   varchar(5000)
+        artifact        varchar(5000),
+        assertion       varchar(5000)
   );
   
   GRANT DELETE, INSERT, SELECT, UPDATE ON nameidentifiers TO idpc;
diff --git a/src/db_postgresql.c b/src/db_postgresql.c
index 5205b0a..6b789f3 100644
--- a/src/db_postgresql.c
+++ b/src/db_postgresql.c
@@ -212,15 +212,15 @@ int db_save_assertion(char *assertion_artifact, LassoAssertion *assertion)
 	return 0;
 }
 
-int db_get_response_dump(char *assertion, char **response_dump)
+int db_get_assertion(char *artifact, char **assertion)
 {
 	PGresult *res;
 	const char *params[1];
 
-	params[0] = assertion;
+	params[0] = artifact;
 
 	res = PQexecParams(sqlconn,
-		"SELECT response_dump from assertions where assertion = $1",
+		"SELECT assertion from assertions where artifact = $1",
 		1, NULL, params, NULL, NULL, 1);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK) {
 		PQclear(res);
@@ -233,20 +233,20 @@ int db_get_response_dump(char *assertion, char **response_dump)
 		return 1;
 	}
 
-	*response_dump = strdup(PQgetvalue(res, 0, 0));
+	*assertion = strdup(PQgetvalue(res, 0, 0));
 	PQclear(res);
 	return 0;
 }
 
-int db_remove_response_dump(char *assertion)
+int db_remove_assertion(char *artifact)
 {
 	PGresult *res;
 	const char *params[1];
 
-	params[0] = assertion;
+	params[0] = artifact;
 
 	res = PQexecParams(sqlconn,
-		"DELETE from assertions where assertion = $1",
+		"DELETE from assertions where artifact = $1",
 		1, NULL, params, NULL, NULL, 1);
 	if (PQresultStatus(res) != PGRES_COMMAND_OK) {
 		PQclear(res);
diff --git a/src/idpc.h b/src/idpc.h
index 680ff2b..a77910e 100644
--- a/src/idpc.h
+++ b/src/idpc.h
@@ -56,8 +56,8 @@ int db_save_identity(char *user_id, char *identity_dump);
 int db_save_session(char *user_id, char *session_dump);
 int db_save_name_identifier(char *name_identifier, char *user_id);
 int db_save_assertion(char *assertion_artifact, LassoAssertion *assertion);
-int db_get_response_dump(char *assertion, char **response_dump);
-int db_remove_response_dump(char *assertion);
+int db_get_assertion(char *artifact, char **assertion);
+int db_remove_assertion(char *artifact);
 int db_get_user_id(char *name_identifier, char **user_id);
 void db_finish();
 
diff --git a/src/soap_end_point.c b/src/soap_end_point.c
index e54bd1e..eab71bd 100644
--- a/src/soap_end_point.c
+++ b/src/soap_end_point.c
@@ -50,7 +50,7 @@ struct req requests[] = {
 char* req_login(LassoServer *server, char *soap_msg)
 {
 	LassoLogin *login;
-	char *response_dump = NULL;
+	char *assertion_dump = NULL;
 	int rc;
 
 	login = lasso_login_new(server);
@@ -60,26 +60,26 @@ char* req_login(LassoServer *server, char *soap_msg)
 		return NULL;
 	}
 
-	rc = db_get_response_dump(login->assertionArtifact, &response_dump);
+	rc = db_get_assertion(login->assertionArtifact, &assertion_dump);
 	if (rc) {
-		fprintf(stderr, "db_get_response_dump failed\n");
+		fprintf(stderr, "db_get_assertion failed\n");
 	} else {
-		rc = lasso_login_set_assertion_from_dump(login, response_dump);
+		rc = lasso_login_set_assertion_from_dump(login, assertion_dump);
 		if (rc) {
 			fprintf(stderr, "set_assertion_from_dump failed\n");
 		}
-		rc = db_remove_response_dump(login->assertionArtifact);
+		rc = db_remove_assertion(login->assertionArtifact);
 		if (rc) {
-			fprintf(stderr, "db_remove_response_dump failed\n");
+			fprintf(stderr, "db_remove_assertion failed\n");
 		}
 	}
 
 	rc = lasso_login_build_response_msg(login);
-	response_dump = strdup(LASSO_PROFILE(login)->msg_body);
+	assertion_dump = strdup(LASSO_PROFILE(login)->msg_body);
 
 	lasso_login_destroy(login);
 
-	return response_dump;
+	return assertion_dump;
 }
 
 char* req_logout(LassoServer *server, char *soap_msg)