diff options
Diffstat (limited to 'plugin/auth_pam/auth_pam.c')
| -rw-r--r-- | plugin/auth_pam/auth_pam.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plugin/auth_pam/auth_pam.c b/plugin/auth_pam/auth_pam.c index 45a5028429f..ec0096609ba 100644 --- a/plugin/auth_pam/auth_pam.c +++ b/plugin/auth_pam/auth_pam.c @@ -17,6 +17,8 @@ #include <unistd.h> #include <string.h> +#include <sys/types.h> +#include <sys/wait.h> #include <mysql/plugin_auth.h> #include "auth_pam_tool.h" #include <my_global.h> @@ -101,7 +103,7 @@ static int pam_auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info) /* no user name yet ? read the client handshake packet with the user name */ if (info->user_name == 0) { - if ((pkt_len= vio->read_packet(vio, &pkt) < 0)) + if ((pkt_len= vio->read_packet(vio, &pkt)) < 0) return CR_ERROR; } else @@ -157,7 +159,7 @@ static int pam_auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info) if ((buf_len= read_string(c_to_p[0], (char *) buf, sizeof(buf))) < 0) goto error_ret; - if (!pkt || (buf[0] >> 1) != 2) + if (!pkt || !*pkt || (buf[0] >> 1) != 2) { PAM_DEBUG((stderr, "PAM: sending CONV string.\n")); if (vio->write_packet(vio, buf, buf_len)) @@ -186,6 +188,7 @@ static int pam_auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info) error_ret: close(p_to_c[1]); close(c_to_p[0]); + waitpid(proc_id, NULL, WNOHANG); PAM_DEBUG((stderr, "PAM: auth result %d.\n", result)); return result; |