Commit d70dcec4 authored by Sergei Golubchik's avatar Sergei Golubchik

fixing pam plugin to compile again

parent 71ca1d67
...@@ -5,6 +5,9 @@ CHECK_INCLUDE_FILES (security/pam_appl.h HAVE_PAM_APPL_H) ...@@ -5,6 +5,9 @@ CHECK_INCLUDE_FILES (security/pam_appl.h HAVE_PAM_APPL_H)
CHECK_FUNCTION_EXISTS (strndup HAVE_STRNDUP) CHECK_FUNCTION_EXISTS (strndup HAVE_STRNDUP)
IF(HAVE_PAM_APPL_H) IF(HAVE_PAM_APPL_H)
IF(HAVE_STRNDUP)
ADD_DEFINITIONS(-DHAVE_STRNDUP)
ENDIF(HAVE_STRNDUP)
MYSQL_ADD_PLUGIN(auth_pam auth_pam.c LINK_LIBRARIES pam MODULE_ONLY) MYSQL_ADD_PLUGIN(auth_pam auth_pam.c LINK_LIBRARIES pam MODULE_ONLY)
ENDIF(HAVE_PAM_APPL_H) ENDIF(HAVE_PAM_APPL_H)
...@@ -14,13 +14,10 @@ ...@@ -14,13 +14,10 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifndef _GNU_SOURCE #define _GNU_SOURCE 1 /* for strndup */
#define _GNU_SOURCE /* For strndup() */
#endif
#include <mysql/plugin_auth.h> #include <mysql/plugin_auth.h>
#include <string.h> #include <string.h>
#include <my_config.h>
#include <security/pam_appl.h> #include <security/pam_appl.h>
#include <security/pam_modules.h> #include <security/pam_modules.h>
...@@ -123,8 +120,7 @@ static int pam_auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info) ...@@ -123,8 +120,7 @@ static int pam_auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
const char *new_username; const char *new_username;
struct param param; struct param param;
/* The following is written in such a way to make also solaris happy */ /* The following is written in such a way to make also solaris happy */
struct pam_conv pam_start_arg = { &conv, NULL }; struct pam_conv pam_start_arg = { &conv, (char*) &param };
pam_start_arg.appdata_ptr= (char*) &param;
/* /*
get the service name, as specified in get the service name, as specified in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment