danvics/howdy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: add appdata_ptr for conv function

Browse source
This commit is contained in:
MusiKid 2022-01-20 14:22:01 +01:00 committed by musikid
parent 9fb3ef5341
commit fa2607db7d
No known key found for this signature in database
GPG key ID: 7567D43648C6E2F4
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/pam/main.cc
View file

@ -100,19 +100,16 @@ int on_howdy_auth(int code, function<int(int, const char *)> conv_function) {
* @param message String to show the user * @param message String to show the user
* @return Returns the conversation function return code * @return Returns the conversation function return code
*/ */
int send_message(function<int(int, const struct pam_message **, int send_message(struct pam_conv *conv, int type, const char *message) {
struct pam_response **, void *)>
conv,
int type, const char *message) {
// No need to free this, it's allocated on the stack // No need to free this, it's allocated on the stack
const struct pam_message msg = {.msg_style = type, .msg = message}; const struct pam_message msg = {.msg_style = type, .msg = message};
const struct pam_message *msgp = &msg; const struct pam_message *msgp = &msg;
struct pam_response res_ = {}; struct pam_response res = {};
struct pam_response *resp_ = &res_; struct pam_response *resp = &res;
// Call the conversation function with the constructed arguments // Call the conversation function with the constructed arguments
return conv(1, &msgp, &resp_, nullptr); return conv->conv(1, &msgp, &resp, conv->appdata_ptr);
} }
/** /**
@ -150,7 +147,7 @@ int identify(pam_handle_t *pamh, int flags, int argc, const char **argv,
// Wrap the PAM conversation function in our own, easier function // Wrap the PAM conversation function in our own, easier function
auto conv_function = auto conv_function =
bind(send_message, conv->conv, placeholders::_1, placeholders::_2); bind(send_message, conv, placeholders::_1, placeholders::_2);
// Error out if we could not ready the config file // Error out if we could not ready the config file
if (reader.ParseError() < 0) { if (reader.ParseError() < 0) {