Skip to content
/ server Public

MDEV-38913: pam_mariadb_mtr.so installation path change #4725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grooverdan wants to merge 1 commit into
base: 10.11
Choose a base branch
from
Open

MDEV-38913: pam_mariadb_mtr.so installation path change #4725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions debian/mariadb-test-data.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 4 additions & 5 deletions plugin/auth_pam/testing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion plugin/auth_pam/testing/mariadb_mtr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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