5.3.4 merge

3 files changed, 36 insertions, 7 deletions

diff --git a/plugin/auth_dialog/dialog.c b/plugin/auth_dialog/dialog.c
index 2026369bc26..0fa5ab93a35 100644
--- a/plugin/auth_dialog/dialog.c
+++ b/plugin/auth_dialog/dialog.c
@@ -148,6 +148,8 @@ static int perform_dialog(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
     if (res)
       return CR_ERROR;
 
+    first= 0;
+
     /* repeat unless it was the last question */
   } while ((cmd & 1) != 1);
 
diff --git a/plugin/auth_pam/auth_pam.c b/plugin/auth_pam/auth_pam.c
index 45c49975f6e..ee13b37f793 100644
--- a/plugin/auth_pam/auth_pam.c
+++ b/plugin/auth_pam/auth_pam.c
@@ -1,5 +1,6 @@
 #include <mysql/plugin_auth.h>
 #include <string.h>
+#include <my_config.h>
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 
@@ -8,6 +9,24 @@ struct param {
   MYSQL_PLUGIN_VIO *vio;
 };
 
+/* It least solaris doesn't have strndup */
+
+#ifndef HAVE_STRNDUP
+char *strndup(const char *from, size_t length)
+{
+  char *ptr;
+  size_t max_length= strlen(from);
+  if (length > max_length)
+    length= max_length;
+  if ((ptr= (char*) malloc(length+1)) != 0)
+  {
+    memcpy((char*) ptr, (char*) from, length);
+    ptr[length]=0;
+  }
+  return ptr;
+}
+#endif
+
 static int conv(int n, const struct pam_message **msg,
                 struct pam_response **resp, void *data)
 {
@@ -71,13 +90,21 @@ static int conv(int n, const struct pam_message **msg,
 
 #define DO(X) if ((status = (X)) != PAM_SUCCESS) goto end
 
+#ifdef SOLARIS
+typedef void** pam_get_item_3_arg;
+#else
+typedef const void** pam_get_item_3_arg;
+#endif
+
 static int pam_auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
 {
   pam_handle_t *pamh = NULL;
   int status;
   const char *new_username;
   struct param param;
-  struct pam_conv c = { &conv, &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;
 
   /*
     get the service name, as specified in
@@ -90,10 +117,10 @@ static int pam_auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
   param.ptr = param.buf + 1;
   param.vio = vio;
 
-  DO( pam_start(service, info->user_name, &c, &pamh) );
+  DO( pam_start(service, info->user_name, &pam_start_arg, &pamh) );
   DO( pam_authenticate (pamh, 0) );
   DO( pam_acct_mgmt(pamh, 0) );
-  DO( pam_get_item(pamh, PAM_USER, (const void**)&new_username) );
+  DO( pam_get_item(pamh, PAM_USER, (pam_get_item_3_arg) &new_username) );
 
   if (new_username && strcmp(new_username, info->user_name))
     strncpy(info->authenticated_as, new_username,
@@ -104,7 +131,7 @@ end:
   return status == PAM_SUCCESS ? CR_OK : CR_ERROR;
 }
 
-static struct st_mysql_auth pam_info =
+static struct st_mysql_auth info =
 {
   MYSQL_AUTHENTICATION_INTERFACE_VERSION,
   "dialog",
@@ -114,7 +141,7 @@ static struct st_mysql_auth pam_info =
 maria_declare_plugin(pam)
 {
   MYSQL_AUTHENTICATION_PLUGIN,
-  &pam_info,
+  &info,
   "pam",
   "Sergei Golubchik",
   "PAM based authentication",
diff --git a/plugin/auth_socket/auth_socket.c b/plugin/auth_socket/auth_socket.c
index dbc8513e5dd..41cb1039fd2 100644
--- a/plugin/auth_socket/auth_socket.c
+++ b/plugin/auth_socket/auth_socket.c
@@ -89,7 +89,7 @@ mysql_declare_plugin(socket_auth)
 {
   MYSQL_AUTHENTICATION_PLUGIN,
   &socket_auth_handler,
-  "auth_socket",
+  "unix_socket",
   "Sergei Golubchik",
   "Unix Socket based authentication",
   PLUGIN_LICENSE_GPL,
@@ -106,7 +106,7 @@ maria_declare_plugin(socket_auth)
 {
   MYSQL_AUTHENTICATION_PLUGIN,
   &socket_auth_handler,
-  "auth_socket",
+  "unix_socket",
   "Sergei Golubchik",
   "Unix Socket based authentication",
   PLUGIN_LICENSE_GPL,