pam: renamed function names

bareos · Jul 10, 2018 · 86bf5ad · 86bf5ad
1 parent 55cfc63
commit 86bf5ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/core/src/dird/auth_pam.cc b/core/src/dird/auth_pam.cc
@@ -57,7 +57,7 @@ static bool pam_conv_callback_send_message(BareosSocket *bs, const char *msg, in
    return true;
 }
 
-static int pam_conv_callback(int num_msg, const struct pam_message **msgm,
+static int PamConversionCallback(int num_msg, const struct pam_message **msgm,
                 struct pam_response **response, void *appdata_ptr)
 {
    if (!appdata_ptr) {
@@ -141,10 +141,10 @@ static int pam_conv_callback(int num_msg, const struct pam_message **msgm,
    return PAM_SUCCESS;
 }
 
-bool pam_authenticate_useragent(BareosSocket *bs, std::string username)
+bool PamAuthenticateUseragent(BareosSocket *bs, std::string username)
 {
    PamData pam_data(bs, username);
-   const struct pam_conv pam_conversation = {pam_conv_callback, (void *) &pam_data};
+   const struct pam_conv pam_conversation = {PamConversionCallback, (void *) &pam_data};
    pam_handle_t *pamh = nullptr;
 
    int err = pam_start(service_name.c_str(), nullptr, &pam_conversation, &pamh);

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 pam_authenticate_useragent(BareosSocket *bs, std::string username);
+bool PamAuthenticateUseragent(BareosSocket *bs, std::string username);
 
 #endif /* BAREOS_DIRD_AUTH_PAM_H */
diff --git a/core/src/dird/ua_server.cc b/core/src/dird/ua_server.cc
@@ -94,7 +94,7 @@ void *HandleUserAgentClientRequest(BareosSocket *user_agent_socket)
       goto getout;
    }
 
-   if (!pam_authenticate_useragent(user_agent_socket, ua->cons ? ua->cons->name() : std::string("user"))) {
+   if (!PamAuthenticateUseragent(user_agent_socket, ua->cons ? ua->cons->name() : std::string("user"))) {
       goto getout;
    }