linux/howdy
0
0
Fork 0
mirror of https://github.com/boltgolt/howdy.git synced 2024-09-12 09:41:18 +02:00
Code Issues Projects Releases Wiki Activity

Fix warnings

Browse source
This commit is contained in:
boltgolt 2023-02-18 20:22:51 +01:00
parent 1dc56b1705
commit d00f7a94fd
No known key found for this signature in database
GPG key ID: BECEC9937E1AAE26
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
howdy/src/pam/main.cc
View file

@ -270,8 +270,8 @@ auto identify(pam_handle_t *pamh, int flags, int argc, const char **argv,
// NOTE: We should replace mutex and condition_variable by atomic wait, but
// it's too recent (C++20)
std::mutex m;
std::condition_variable cv;
std::mutex mutx;
std::condition_variable convar;
ConfirmationType confirmation_type(ConfirmationType::Unset);
// This task wait for the status of the python subprocess (we don't want a
@ -280,12 +280,12 @@ auto identify(pam_handle_t *pamh, int flags, int argc, const char **argv,
int status;
wait(&status);
{
std::unique_lock<std::mutex> lk(m);
std::unique_lock<std::mutex> lock(mutx);
if (confirmation_type == ConfirmationType::Unset) {
confirmation_type = ConfirmationType::Howdy;
}
}
cv.notify_one();
convar.notify_one();
return status;
});
@ -297,12 +297,12 @@ auto identify(pam_handle_t *pamh, int flags, int argc, const char **argv,
int pam_res = pam_get_authtok(
pamh, PAM_AUTHTOK, const_cast<const char **>(&auth_tok_ptr), nullptr);
{
std::unique_lock<std::mutex> lk(m);
std::unique_lock<std::mutex> lock(mutx);
if (confirmation_type == ConfirmationType::Unset) {
confirmation_type = ConfirmationType::Pam;
}
}
cv.notify_one();
convar.notify_one();
return std::tuple<int, char *>(pam_res, auth_tok_ptr);
});
@ -315,8 +315,8 @@ auto identify(pam_handle_t *pamh, int flags, int argc, const char **argv,
// Wait for the end either of the child or the password input
{
std::unique_lock<std::mutex> lk(m);
cv.wait(lk, [&] { return confirmation_type != ConfirmationType::Unset; });
std::unique_lock<std::mutex> lock(mutx);
convar.wait(lock, [&] { return confirmation_type != ConfirmationType::Unset; });
}
// The password has been entered or an error has occurred

10
howdy/src/pam/optional_task.hh
View file

@ -11,11 +11,11 @@ template <typename T> class optional_task {
std::thread thread;
std::packaged_task<T()> task;
std::future<T> future;
bool spawned;
bool is_active;
bool spawned{false};
bool is_active{false};
public:
explicit optional_task(std::function<T()> fn);
explicit optional_task(std::function<T()> func);
void activate();
template <typename R, typename P>
auto wait(std::chrono::duration<R, P> dur) -> std::future_status;
@ -25,8 +25,8 @@ public:
};
template <typename T>
optional_task<T>::optional_task(std::function<T()> fn)
: task(std::packaged_task<T()>(std::move(fn))), future(task.get_future()),
optional_task<T>::optional_task(std::function<T()> func)
: task(std::packaged_task<T()>(std::move(func))), future(task.get_future()),
spawned(false), is_active(false) {}
// Create a new thread and launch the task on it.