summaryrefslogtreecommitdiff
path: root/plugin/auth_pam/auth_pam.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-02-29 21:55:33 +0100
committerSergei Golubchik <sergii@pisem.net>2012-02-29 21:55:33 +0100
commita2478a6c7269128ebf30ad539b919a9a70ee9f58 (patch)
treea805cd2005264434ef5388d85a1f2048c98ba024 /plugin/auth_pam/auth_pam.c
parente4bfb6f161b77a8c5801ba71b4ffd980066a1399 (diff)
downloadmariadb-git-a2478a6c7269128ebf30ad539b919a9a70ee9f58.tar.gz
fixing pam plugin to compile again
Diffstat (limited to 'plugin/auth_pam/auth_pam.c')
-rw-r--r--plugin/auth_pam/auth_pam.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/plugin/auth_pam/auth_pam.c b/plugin/auth_pam/auth_pam.c
index 6507c482ef9..d8211294910 100644
--- a/plugin/auth_pam/auth_pam.c
+++ b/plugin/auth_pam/auth_pam.c
@@ -14,13 +14,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE /* For strndup() */
-#endif
+#define _GNU_SOURCE 1 /* for strndup */
#include <mysql/plugin_auth.h>
#include <string.h>
-#include <my_config.h>
#include <security/pam_appl.h>
#include <security/pam_modules.h>
@@ -123,8 +120,7 @@ static int pam_auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
const char *new_username;
struct param param;
/* The following is written in such a way to make also solaris happy */
- struct pam_conv pam_start_arg = { &conv, NULL };
- pam_start_arg.appdata_ptr= (char*) &param;
+ struct pam_conv pam_start_arg = { &conv, (char*) &param };
/*
get the service name, as specified in