From 2c38adad7b527aceb4f9cb41c7d7b4c66d4580c9 Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Mon, 7 Mar 2016 17:07:16 +0100 Subject: [PATCH] pam_sss: reorder pam_message array There are different expectations about how the pam_message array is organized, details can be found in the pam_start man page. E.g. sudo was not able to handle the Linux-PAM style but expected the Solaris PAM style. With this patch both styles should work as expected. Resolves https://fedorahosted.org/sssd/ticket/2971 --- src/sss_client/pam_sss.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/sss_client/pam_sss.c b/src/sss_client/pam_sss.c index b4f7efe49017870186f1cd9e91603033a5354770..f16f12c4579f603d40fe31abb1ab7a3a2fafd4cd 100644 --- a/src/sss_client/pam_sss.c +++ b/src/sss_client/pam_sss.c @@ -1260,8 +1260,7 @@ static int prompt_2fa(pam_handle_t *pamh, struct pam_items *pi, int ret; const struct pam_conv *conv; const struct pam_message *mesg[2] = { NULL, NULL }; - struct pam_message *m1; - struct pam_message *m2; + struct pam_message *m; struct pam_response *resp = NULL; size_t needed_size; @@ -1270,29 +1269,22 @@ static int prompt_2fa(pam_handle_t *pamh, struct pam_items *pi, return ret; } - m1 = malloc(sizeof(struct pam_message)); - if (m1 == NULL) { + m = malloc(2 * sizeof(struct pam_message)); + if (m == NULL) { D(("Malloc failed.")); return PAM_SYSTEM_ERR; } - m2 = malloc(sizeof(struct pam_message)); - if (m2 == NULL) { - D(("Malloc failed.")); - free(m1); - return PAM_SYSTEM_ERR; - } - m1->msg_style = PAM_PROMPT_ECHO_OFF; - m1->msg = prompt_fa1; - m2->msg_style = PAM_PROMPT_ECHO_OFF; - m2->msg = prompt_fa2; + m[0].msg_style = PAM_PROMPT_ECHO_OFF; + m[0].msg = prompt_fa1; + m[1].msg_style = PAM_PROMPT_ECHO_OFF; + m[1].msg = prompt_fa2; - mesg[0] = (const struct pam_message *) m1; - mesg[1] = (const struct pam_message *) m2; + mesg[0] = (const struct pam_message *) m; + mesg[1] = & (( *mesg )[1]); ret = conv->conv(2, mesg, &resp, conv->appdata_ptr); - free(m1); - free(m2); + free(m); if (ret != PAM_SUCCESS) { D(("Conversation failure: %s.", pam_strerror(pamh, ret))); return ret; -- 2.1.0