Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
01f8f33b
Commit
01f8f33b
authored
Apr 23, 2020
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-21913 Add pam_user_map.so file to binary tarball package
parent
d0150dc1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
cmake/install_layout.cmake
cmake/install_layout.cmake
+4
-0
plugin/auth_pam/CMakeLists.txt
plugin/auth_pam/CMakeLists.txt
+2
-2
No files found.
cmake/install_layout.cmake
View file @
01f8f33b
...
@@ -128,6 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files")
...
@@ -128,6 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files")
SET
(
INSTALL_MYSQLDATADIR_STANDALONE
"data"
)
SET
(
INSTALL_MYSQLDATADIR_STANDALONE
"data"
)
SET
(
INSTALL_UNIX_ADDRDIR_STANDALONE
"/tmp/mysql.sock"
)
SET
(
INSTALL_UNIX_ADDRDIR_STANDALONE
"/tmp/mysql.sock"
)
SET
(
INSTALL_PAMDIR_STANDALONE
"share"
)
SET
(
INSTALL_PAMDATADIR_STANDALONE
"share"
)
#
#
# RPM layout
# RPM layout
#
#
...
@@ -164,6 +166,7 @@ SET(INSTALL_SYSTEMD_UNITDIR_RPM "/usr/lib/systemd/system")
...
@@ -164,6 +166,7 @@ SET(INSTALL_SYSTEMD_UNITDIR_RPM "/usr/lib/systemd/system")
SET
(
INSTALL_SYSTEMD_SYSUSERSDIR_RPM
"/usr/lib/sysusers.d"
)
SET
(
INSTALL_SYSTEMD_SYSUSERSDIR_RPM
"/usr/lib/sysusers.d"
)
SET
(
INSTALL_SYSTEMD_TMPFILESDIR_RPM
"/usr/lib/tmpfiles.d"
)
SET
(
INSTALL_SYSTEMD_TMPFILESDIR_RPM
"/usr/lib/tmpfiles.d"
)
SET
(
INSTALL_PAMDIR_RPM
"/
${
INSTALL_LIBDIR_RPM
}
/security"
)
SET
(
INSTALL_PAMDIR_RPM
"/
${
INSTALL_LIBDIR_RPM
}
/security"
)
SET
(
INSTALL_PAMDATADIR_RPM
"/etc/security"
)
#
#
# DEB layout
# DEB layout
...
@@ -197,6 +200,7 @@ SET(INSTALL_SYSTEMD_UNITDIR_DEB "/lib/systemd/system")
...
@@ -197,6 +200,7 @@ SET(INSTALL_SYSTEMD_UNITDIR_DEB "/lib/systemd/system")
SET
(
INSTALL_SYSTEMD_SYSUSERSDIR_DEB
"/usr/lib/sysusers.d"
)
SET
(
INSTALL_SYSTEMD_SYSUSERSDIR_DEB
"/usr/lib/sysusers.d"
)
SET
(
INSTALL_SYSTEMD_TMPFILESDIR_DEB
"/usr/lib/tmpfiles.d"
)
SET
(
INSTALL_SYSTEMD_TMPFILESDIR_DEB
"/usr/lib/tmpfiles.d"
)
SET
(
INSTALL_PAMDIR_DEB
"/lib/
${
CMAKE_CXX_LIBRARY_ARCHITECTURE
}
/security"
)
SET
(
INSTALL_PAMDIR_DEB
"/lib/
${
CMAKE_CXX_LIBRARY_ARCHITECTURE
}
/security"
)
SET
(
INSTALL_PAMDATADIR_DEB
"/etc/security"
)
#
#
# SVR4 layout
# SVR4 layout
...
...
plugin/auth_pam/CMakeLists.txt
View file @
01f8f33b
...
@@ -22,7 +22,7 @@ IF(HAVE_PAM_APPL_H)
...
@@ -22,7 +22,7 @@ IF(HAVE_PAM_APPL_H)
IF
(
HAVE_STRNDUP
)
IF
(
HAVE_STRNDUP
)
ADD_DEFINITIONS
(
-DHAVE_STRNDUP
)
ADD_DEFINITIONS
(
-DHAVE_STRNDUP
)
ENDIF
(
HAVE_STRNDUP
)
ENDIF
(
HAVE_STRNDUP
)
FIND_LIBRARY
(
PAM_LIBRARY pam
)
FIND_LIBRARY
(
PAM_LIBRARY pam
)
# for srpm build-depends detection
MYSQL_ADD_PLUGIN
(
auth_pam auth_pam.c LINK_LIBRARIES pam MODULE_ONLY
)
MYSQL_ADD_PLUGIN
(
auth_pam auth_pam.c LINK_LIBRARIES pam MODULE_ONLY
)
IF
(
TARGET auth_pam
)
IF
(
TARGET auth_pam
)
...
@@ -31,7 +31,7 @@ IF(HAVE_PAM_APPL_H)
...
@@ -31,7 +31,7 @@ IF(HAVE_PAM_APPL_H)
SET_TARGET_PROPERTIES
(
pam_user_map PROPERTIES PREFIX
""
)
SET_TARGET_PROPERTIES
(
pam_user_map PROPERTIES PREFIX
""
)
IF
(
INSTALL_PAMDIR
)
IF
(
INSTALL_PAMDIR
)
INSTALL
(
TARGETS pam_user_map DESTINATION
${
INSTALL_PAMDIR
}
COMPONENT Server
)
INSTALL
(
TARGETS pam_user_map DESTINATION
${
INSTALL_PAMDIR
}
COMPONENT Server
)
INSTALL
(
FILES mapper/user_map.conf DESTINATION
/etc/security
COMPONENT Server
)
INSTALL
(
FILES mapper/user_map.conf DESTINATION
${
INSTALL_PAMDATADIR
}
COMPONENT Server
)
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
(
HAVE_PAM_APPL_H
)
ENDIF
(
HAVE_PAM_APPL_H
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment