Merge tag 'upstream/5.1.0'

Upstream version 5.1.0

1 files changed, 13 insertions, 13 deletions

diff --git a/src/medsrv/controller/user_controller.c b/src/medsrv/controller/user_controller.c
index 35c9d90c8..36d04e12c 100644
--- a/src/medsrv/controller/user_controller.c
+++ b/src/medsrv/controller/user_controller.c
@@ -76,7 +76,7 @@ static chunk_t hash_password(char *login, char *password)
 /**
  * Login a user.
  */
-static void login(private_user_controller_t *this, request_t *request)
+static void login(private_user_controller_t *this, fast_request_t *request)
 {
 	if (request->get_query_data(request, "submit"))
 	{
@@ -115,7 +115,7 @@ static void login(private_user_controller_t *this, request_t *request)
 /**
  * Logout a user.
  */
-static void logout(private_user_controller_t *this, request_t *request)
+static void logout(private_user_controller_t *this, fast_request_t *request)
 {
 	request->redirect(request, "user/login");
 	request->close_session(request);
@@ -124,8 +124,8 @@ static void logout(private_user_controller_t *this, request_t *request)
 /**
  * verify a user entered username for validity
  */
-static bool verify_login(private_user_controller_t *this, request_t *request,
-						 char *login)
+static bool verify_login(private_user_controller_t *this,
+						 fast_request_t *request, char *login)
 {
 	if (!login || *login == '\0')
 	{
@@ -156,7 +156,8 @@ static bool verify_login(private_user_controller_t *this, request_t *request,
 /**
  * verify a user entered password for validity
  */
-static bool verify_password(private_user_controller_t *this, request_t *request,
+static bool verify_password(private_user_controller_t *this,
+							fast_request_t *request,
 							char *password, char *confirm)
 {
 	if (!password || *password == '\0')
@@ -181,7 +182,7 @@ static bool verify_password(private_user_controller_t *this, request_t *request,
 /**
  * Register a user.
  */
-static void add(private_user_controller_t *this, request_t *request)
+static void add(private_user_controller_t *this, fast_request_t *request)
 {
 	char *login = "";
 
@@ -222,7 +223,7 @@ static void add(private_user_controller_t *this, request_t *request)
 /**
  * Edit the logged in user
  */
-static void edit(private_user_controller_t *this, request_t *request)
+static void edit(private_user_controller_t *this, fast_request_t *request)
 {
 	enumerator_t *query;
 	char *old_login;
@@ -297,14 +298,14 @@ static void edit(private_user_controller_t *this, request_t *request)
 	request->render(request, "templates/user/edit.cs");
 }
 
-METHOD(controller_t, get_name, char*,
+METHOD(fast_controller_t, get_name, char*,
 	private_user_controller_t *this)
 {
 	return "user";
 }
 
-METHOD(controller_t, handle, void,
-	private_user_controller_t *this, request_t *request, char *action,
+METHOD(fast_controller_t, handle, void,
+	private_user_controller_t *this, fast_request_t *request, char *action,
 	char *p2, char *p3, char *p4, char *p5)
 {
 	if (action)
@@ -333,7 +334,7 @@ METHOD(controller_t, handle, void,
 	request->redirect(request, "user/login");
 }
 
-METHOD(controller_t, destroy, void,
+METHOD(fast_controller_t, destroy, void,
 	private_user_controller_t *this)
 {
 	free(this);
@@ -342,7 +343,7 @@ METHOD(controller_t, destroy, void,
 /*
  * see header file
  */
-controller_t *user_controller_create(user_t *user, database_t *db)
+fast_controller_t *user_controller_create(user_t *user, database_t *db)
 {
 	private_user_controller_t *this;
 
@@ -362,4 +363,3 @@ controller_t *user_controller_create(user_t *user, database_t *db)
 
 	return &this->public.controller;
 }
-