[Libreoffice-commits] online.git: wsd/FileServer.cpp

Miklos Vajna vmiklos at collabora.co.uk
Wed Jan 31 08:38:25 UTC 2018


 wsd/FileServer.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 692d24213b36c0345aa67924eb990c9db8bce584
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jan 31 09:33:35 2018 +0100

    wsd: can avoid copying here FileServer
    
    Change-Id: If194705eae76e81141df9c4e86f7e7bc94b250b6

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index ad4b890d..baa5931b 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -66,7 +66,7 @@ int functionConversation(int /*num_msg*/, const struct pam_message** /*msg*/,
     return PAM_SUCCESS;
 }
 
-bool isPamAuthOk(const std::string user, const std::string pass)
+bool isPamAuthOk(const std::string& user, const std::string& pass)
 {
     struct pam_conv localConversation { functionConversation, nullptr };
     pam_handle_t *localAuthHandle = NULL;
@@ -138,7 +138,7 @@ bool FileServerRequestHandler::isAdminLoggedIn(const HTTPRequest& request,
 
     HTTPBasicCredentials credentials(request);
     std::string userProvidedPwd = credentials.getPassword();
-    std::string userProvidedUsr = credentials.getUsername();
+    const std::string& userProvidedUsr = credentials.getUsername();
 
     // If no cookie found, or is invalid, let admin re-login
     const std::string user = config.getString("admin_console.username", "");


More information about the Libreoffice-commits mailing list