database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

MDEV-38913: pam_mariadb_mtr.so installation path change

Browse Source 
This reverts the effect of MDEV-21654 and includes
pam_mariadb_mtr in the mariadb-test-data Deb package.

This allows our CI systems to run tests on the
pam implementation on Debian systems.

As the pam configuration can include a full path,
we've change the installation of the pam module
pam_mariadb_mtr.so to under the /usr/lib*/plugins/test_pam_modules
directory and configured the pam configuration file,
suite/plugins/pam/mariadb_mtr, to include the
full path to pam_mariadb_mtr.so.
This commit is contained in:
Daniel Black
2026-02-27 16:56:02 +11:00
parent aeb477b71a
commit 7efbb0d0b2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/mariadb-test-data.install vendored
View File

@@ -1,3 +1,4 @@
usr/lib/mysql/plugin/test_pam_modules
usr/share/mysql/mysql-test/collections
usr/share/mysql/mysql-test/include
usr/share/mysql/mysql-test/main

9
plugin/auth_pam/testing/CMakeLists.txt
View File

@@ -10,8 +10,7 @@ IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
PROPERTY COMPILE_FLAGS "-Wno-incompatible-pointer-types-discards-qualifiers")
ENDIF()
IF (NOT DEB) # avoid arch-dependent-file-in-usr-share error
SET(dest DESTINATION "${INSTALL_MYSQLTESTDIR}/suite/plugins/pam" COMPONENT Test)
INSTALL(TARGETS pam_mariadb_mtr ${dest})
INSTALL(FILES mariadb_mtr.conf RENAME mariadb_mtr ${dest})
ENDIF()
SET(PAM_MARIADB_MTR_LOCATON ${INSTALL_PLUGINDIR}/test_pam_modules)
INSTALL(TARGETS pam_mariadb_mtr DESTINATION ${PAM_MARIADB_MTR_LOCATON} COMPONENT Test)
CONFIGURE_FILE(mariadb_mtr.conf mariadb_mtr)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb_mtr DESTINATION "${INSTALL_MYSQLTESTDIR}/suite/plugins/pam" COMPONENT Test)

2
plugin/auth_pam/testing/mariadb_mtr.conf
View File

@@ -1,4 +1,4 @@
# Put it in /etc/pam.d/mariadb_mtr
auth required pam_mariadb_mtr.so pam_test
auth required @CMAKE_INSTALL_PREFIX@/@PAM_MARIADB_MTR_LOCATON@/pam_mariadb_mtr.so pam_test
account required pam_permit.so