From 3eaecac33685ca3297d53e041ab5c5116bc18d25 Mon Sep 17 00:00:00 2001
From: Ed Tanous <ed@tanous.net>
Date: Wed, 8 May 2024 16:26:24 -0700
Subject: Fix merge conflict in session

9f217c26f58c0a99c18e7cac7b095dcf6068562d
had a merge conflict that was resolved incorrectly with
25b54dba775b31021a3a4677eb79e9771bcb97f7

The line returning the cookie session got dropped in that merge
conflict. Restore it.

Tested: Webui can log in, and cookie auth works again.

Ideally in the future we'd have some tests for places like this where
we've gone outside the redfish spec.

Change-Id: I7740e19dac4d0dae5c5c9b27a5b8699a4751fd6f
Signed-off-by: Ed Tanous <ed@tanous.net>
---
 include/authentication.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/authentication.hpp b/include/authentication.hpp
index 6483365bef..5f43f0af2f 100644
--- a/include/authentication.hpp
+++ b/include/authentication.hpp
@@ -177,6 +177,7 @@ inline std::shared_ptr<persistent_data::UserSession>
                 }
             }
         }
+        return sessionOut;
     }
     return nullptr;
 }
-- 
cgit v1.2.3