From 892cd36992030a6cca91ac0c0228656842720a27 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 3 Feb 2012 10:31:39 +0100 Subject: [PATCH] make pam plugin to build in 5.5. fix pam.tets for 5.5 --- mysql-test/suite/plugins/r/pam.result | 3 +++ mysql-test/suite/plugins/t/pam.test | 4 +++- plugin/auth_pam/Makefile.am | 16 --------------- plugin/auth_pam/plug.in | 4 ---- plugin/feedback/Makefile.am | 18 ----------------- plugin/feedback/plug.in | 28 --------------------------- 6 files changed, 6 insertions(+), 67 deletions(-) delete mode 100644 plugin/auth_pam/Makefile.am delete mode 100644 plugin/auth_pam/plug.in delete mode 100644 plugin/feedback/Makefile.am delete mode 100644 plugin/feedback/plug.in diff --git a/mysql-test/suite/plugins/r/pam.result b/mysql-test/suite/plugins/r/pam.result index 1c9036c317e..432fb48eb5a 100644 --- a/mysql-test/suite/plugins/r/pam.result +++ b/mysql-test/suite/plugins/r/pam.result @@ -1,5 +1,7 @@ install plugin pam soname 'auth_pam.so'; create user test_pam identified via pam using 'mariadb_mtr'; +create user pam_test; +grant proxy on pam_test to test_pam; # # athentication is successful, challenge/pin are ok # note that current_user() differts from user() @@ -19,4 +21,5 @@ Enter: not very secret challenge Now, the magic number! PIN: **** drop user test_pam; +drop user pam_test; uninstall plugin pam; diff --git a/mysql-test/suite/plugins/t/pam.test b/mysql-test/suite/plugins/t/pam.test index 3f4c563d8dc..2a097b9bfd5 100644 --- a/mysql-test/suite/plugins/t/pam.test +++ b/mysql-test/suite/plugins/t/pam.test @@ -9,9 +9,10 @@ if (!$PAM_SETUP_FOR_MTR) { skip No pam setup for mtr; } ---replace_result .dll .so eval install plugin pam soname '$AUTH_PAM_SO'; create user test_pam identified via pam using 'mariadb_mtr'; +create user pam_test; +grant proxy on pam_test to test_pam; let $plugindir=`SELECT @@global.plugin_dir`; @@ -42,5 +43,6 @@ EOF --remove_file $MYSQLTEST_VARDIR/tmp/pam_good.txt --remove_file $MYSQLTEST_VARDIR/tmp/pam_bad.txt drop user test_pam; +drop user pam_test; uninstall plugin pam; diff --git a/plugin/auth_pam/Makefile.am b/plugin/auth_pam/Makefile.am deleted file mode 100644 index be20d393781..00000000000 --- a/plugin/auth_pam/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -EXTRA_LTLIBRARIES = auth_pam.la libauth_pam.la - -pkgplugindir=$(pkglibdir)/plugin -AM_CPPFLAGS = -I$(top_srcdir)/include - -pkgplugin_LTLIBRARIES = @plugin_auth_pam_shared_target@ -auth_pam_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -lpam -auth_pam_la_CFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN -auth_pam_la_SOURCES = auth_pam.c - -noinst_LTLIBRARIES = @plugin_auth_pam_static_target@ -libauth_pam_la_LDFLAGS = -lpam -libauth_pam_la_SOURCES = auth_pam.c - -EXTRA_DIST = plug.in - diff --git a/plugin/auth_pam/plug.in b/plugin/auth_pam/plug.in deleted file mode 100644 index 05af6ce6461..00000000000 --- a/plugin/auth_pam/plug.in +++ /dev/null @@ -1,4 +0,0 @@ -MYSQL_PLUGIN(auth_pam, [PAM Authentication Plugin], [PAM Authentication Plugin]) -MYSQL_PLUGIN_DYNAMIC(auth_pam, [auth_pam.la]) - -AC_CHECK_HEADER([security/pam_appl.h],,[MYSQL_PLUGIN_WITHOUT(auth_pam)]) diff --git a/plugin/feedback/Makefile.am b/plugin/feedback/Makefile.am deleted file mode 100644 index 7d2a61d593f..00000000000 --- a/plugin/feedback/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -pkgplugindir = $(pkglibdir)/plugin -INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ - -I$(top_srcdir)/regex -I$(top_srcdir)/sql - -EXTRA_LTLIBRARIES = feedback.la libfeedback.la -pkgplugin_LTLIBRARIES = @plugin_feedback_shared_target@ -feedback_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -feedback_la_CXXFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN -feedback_la_SOURCES = feedback.cc utils.cc url_base.cc url_http.cc \ - sender_thread.cc - -noinst_LTLIBRARIES = @plugin_feedback_static_target@ -libfeedback_la_SOURCES= feedback.cc utils.cc url_base.cc url_http.cc \ - sender_thread.cc - -noinst_HEADERS = feedback.h -EXTRA_DIST = CMakeLists.txt plug.in - diff --git a/plugin/feedback/plug.in b/plugin/feedback/plug.in deleted file mode 100644 index 88a4448321d..00000000000 --- a/plugin/feedback/plug.in +++ /dev/null @@ -1,28 +0,0 @@ -MYSQL_PLUGIN(feedback,[MariaDB User Feedback Plugin], - [MariaDB User Feedback Plugin]) - -dnl Although it's not exactly obvious, top-level CMakeLists.txt parses plug.in -dnl files, in particular looking for what the library name should be. It uses -dnl regexp that matches MYSQL_PLUGIN_DYNAMIC or MYSQL_PLUGIN_STATIC, followed -dnl by an open parenthesys, and the plugin name. Having engine name enclosed in -dnl square brackets below causes this regexp to fail and as a result feedback -dnl plugin will not be considered for dynamic builds on Windows. -dnl Unfortunately, feedback cannot be built dynamically on Windows, because it -dnl needs to access server internals that aren't designed for plugin use and -dnl aren't marked with MYSQL_PLUGIN_IMPORT. -MYSQL_PLUGIN_DYNAMIC([feedback], [feedback.la]) -ifelse(index(AC_PACKAGE_NAME, [MariaDB]), -1, [], [ - -dnl MariaDB and MySQL define static plugins differently. -dnl I only support MariaDB here, for now. -MYSQL_PLUGIN_STATIC(feedback, [libfeedback.la]) - -]) - -dnl MariaDB before 5.5 needs this define: -MYSQL_PLUGIN_DEFINE(feedback, [WITH_FEEDBACK_PLUGIN]) - -MYSQL_PLUGIN_ACTIONS(feedback, [ - AC_CHECK_HEADERS([netdb.h sys/utsname.h]) -]) -