director: added configuration parameter UsePamAuthentication

- general console - named console
bareos · Sep 20, 2018 · 515c053 · 515c053
1 parent 2a2dec6
commit 515c053
Show file tree

Hide file tree

Showing 5 changed files with 2,775 additions and 2,694 deletions.
diff --git a/core/src/dird/auth_pam.cc b/core/src/dird/auth_pam.cc
@@ -139,7 +139,7 @@ static int PamConversionCallback(int num_msg, const struct pam_message **msgm,
    return PAM_SUCCESS;
 }
 
-bool PamAuthenticateUseragent(BareosSocket *UA_sock, std::string username)
+bool PamAuthenticateUseragent(BareosSocket *UA_sock, const std::string &username)
 {
    std::unique_ptr<PamData> pam_callback_data(new PamData(UA_sock, username));
    std::unique_ptr<struct pam_conv> pam_conversation_container(new struct pam_conv);
@@ -148,7 +148,8 @@ bool PamAuthenticateUseragent(BareosSocket *UA_sock, std::string username)
    pam_conversation_container->conv = PamConversionCallback;
    pam_conversation_container->appdata_ptr = pam_callback_data.get();
 
-   int err = pam_start(service_name.c_str(), nullptr, pam_conversation_container.get(), &pamh);
+   int err = pam_start(service_name.c_str(), username.c_str(),
+                      pam_conversation_container.get(), &pamh);
    if (err != PAM_SUCCESS) {
       Dmsg1(debuglevel, "PAM start failed: %s\n", pam_strerror(pamh, err));
    }

diff --git a/core/src/dird/auth_pam.h b/core/src/dird/auth_pam.h
@@ -25,6 +25,6 @@
 #include <string>
 
 class BareosSocket;
-bool PamAuthenticateUseragent(BareosSocket *UA_sock, std::string username);
+bool PamAuthenticateUseragent(BareosSocket *UA_sock, const std::string &username);
 
 #endif /* BAREOS_DIRD_AUTH_PAM_H_ */