Merge pull request #15972 from rstudio/bugfix-error-after-fork

jeffvroom · web-flow · commit f0b76cc00df9 · 2025-04-29T14:33:08.000-07:00
Avoid LOG_ERROR in code run after fork/before exec
diff --git a/src/cpp/server_core/system/Pam.cpp b/src/cpp/server_core/system/Pam.cpp
@@ -20,6 +20,7 @@
 
 #include <core/Log.hpp>
 #include <core/system/System.hpp>
+#include <shared_core/system/SyslogDestination.hpp>
 
 namespace rstudio {
 namespace core {
@@ -187,22 +188,22 @@ int PAM::login(const std::string& username,
                          &pamh_);
    if (status_ != PAM_SUCCESS)
    {
-      LOG_ERROR_MESSAGE("pam_start failed: " + lastError());
+      safeLogToSyslog("pam-login", log::LogLevel::ERR, "pam_start failed: " + lastError());
       return status_;
    }
 
    status_ = ::pam_authenticate(pamh_, defaultFlags_);
    if (status_ != PAM_SUCCESS)
    {
       if (status_ != PAM_AUTH_ERR)
-         LOG_ERROR_MESSAGE("pam_authenticate failed: " + lastError());
+         safeLogToSyslog("pam-login", log::LogLevel::ERR, "pam_authenticate failed: " + lastError());
       return status_;
    }
 
    status_ = ::pam_acct_mgmt(pamh_, defaultFlags_);
    if (status_ != PAM_SUCCESS)
    {
-      LOG_ERROR_MESSAGE("pam_acct_mgmt failed: " + lastError());
+      safeLogToSyslog("pam-login", log::LogLevel::ERR, "pam_acct_mgmt failed: " + lastError());
       return status_;
    }
 

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`#include <core/Log.hpp>`
`22`	`22`	`#include <core/system/System.hpp>`
	`23`	`+#include <shared_core/system/SyslogDestination.hpp>`
`23`	`24`
`24`	`25`	`namespace rstudio {`
`25`	`26`	`namespace core {`
`@@ -187,22 +188,22 @@ int PAM::login(const std::string& username,`
`187`	`188`	`&pamh_);`
`188`	`189`	`if (status_ != PAM_SUCCESS)`
`189`	`190`	`{`
`190`		`- LOG_ERROR_MESSAGE("pam_start failed: " + lastError());`
	`191`	`+ safeLogToSyslog("pam-login", log::LogLevel::ERR, "pam_start failed: " + lastError());`
`191`	`192`	`return status_;`
`192`	`193`	`}`
`193`	`194`
`194`	`195`	`status_ = ::pam_authenticate(pamh_, defaultFlags_);`
`195`	`196`	`if (status_ != PAM_SUCCESS)`
`196`	`197`	`{`
`197`	`198`	`if (status_ != PAM_AUTH_ERR)`
`198`		`- LOG_ERROR_MESSAGE("pam_authenticate failed: " + lastError());`
	`199`	`+ safeLogToSyslog("pam-login", log::LogLevel::ERR, "pam_authenticate failed: " + lastError());`
`199`	`200`	`return status_;`
`200`	`201`	`}`
`201`	`202`
`202`	`203`	`status_ = ::pam_acct_mgmt(pamh_, defaultFlags_);`
`203`	`204`	`if (status_ != PAM_SUCCESS)`
`204`	`205`	`{`
`205`		`- LOG_ERROR_MESSAGE("pam_acct_mgmt failed: " + lastError());`
	`206`	`+ safeLogToSyslog("pam-login", log::LogLevel::ERR, "pam_acct_mgmt failed: " + lastError());`
`206`	`207`	`return status_;`
`207`	`208`	`}`
`208`	`209`