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
8870f18e
Commit
8870f18e
authored
Jan 20, 2020
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-17292 Package the pam_user_map module
parent
42049f9d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
0 deletions
+34
-0
cmake/cpack_rpm.cmake
cmake/cpack_rpm.cmake
+3
-0
cmake/install_layout.cmake
cmake/install_layout.cmake
+6
-0
debian/mariadb-server-10.2.install
debian/mariadb-server-10.2.install
+2
-0
plugin/auth_pam/CMakeLists.txt
plugin/auth_pam/CMakeLists.txt
+10
-0
plugin/auth_pam/mapper/user_map.conf
plugin/auth_pam/mapper/user_map.conf
+13
-0
No files found.
cmake/cpack_rpm.cmake
View file @
8870f18e
...
@@ -100,8 +100,11 @@ SET(ignored
...
@@ -100,8 +100,11 @@ SET(ignored
"%ignore /etc"
"%ignore /etc"
"%ignore /etc/init.d"
"%ignore /etc/init.d"
"%ignore /etc/logrotate.d"
"%ignore /etc/logrotate.d"
"%ignore /etc/security"
"%ignore /etc/systemd"
"%ignore /etc/systemd"
"%ignore /etc/systemd/system"
"%ignore /etc/systemd/system"
"%ignore /lib"
"%ignore /lib/security"
"%ignore
${
CMAKE_INSTALL_PREFIX
}
"
"%ignore
${
CMAKE_INSTALL_PREFIX
}
"
"%ignore
${
CMAKE_INSTALL_PREFIX
}
/bin"
"%ignore
${
CMAKE_INSTALL_PREFIX
}
/bin"
"%ignore
${
CMAKE_INSTALL_PREFIX
}
/include"
"%ignore
${
CMAKE_INSTALL_PREFIX
}
/include"
...
...
cmake/install_layout.cmake
View file @
8870f18e
...
@@ -163,6 +163,7 @@ SET(INSTALL_UNIX_ADDRDIR_RPM "${INSTALL_MYSQLDATADIR_RPM}/mysql.sock"
...
@@ -163,6 +163,7 @@ SET(INSTALL_UNIX_ADDRDIR_RPM "${INSTALL_MYSQLDATADIR_RPM}/mysql.sock"
SET
(
INSTALL_SYSTEMD_UNITDIR_RPM
"/usr/lib/systemd/system"
)
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
"/lib/security"
)
#
#
# DEB layout
# DEB layout
...
@@ -195,6 +196,11 @@ SET(INSTALL_UNIX_ADDRDIR_DEB "/var/run/mysqld/mysqld.sock")
...
@@ -195,6 +196,11 @@ SET(INSTALL_UNIX_ADDRDIR_DEB "/var/run/mysqld/mysqld.sock")
SET
(
INSTALL_SYSTEMD_UNITDIR_DEB
"/lib/systemd/system"
)
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"
)
IF
(
CMAKE_SIZEOF_VOID_P EQUAL 8
)
SET
(
INSTALL_PAMDIR_DEB
"/lib/x86_64-linux-gnu/security"
)
ELSE
()
SET
(
INSTALL_PAMDIR_DEB
"/lib/i386-linux-gnu/security"
)
ENDIF
()
#
#
# SVR4 layout
# SVR4 layout
...
...
debian/mariadb-server-10.2.install
View file @
8870f18e
...
@@ -3,7 +3,9 @@ debian/additions/debian-start.inc.sh usr/share/mysql
...
@@ -3,7 +3,9 @@ debian/additions/debian-start.inc.sh usr/share/mysql
debian
/
additions
/
echo_stderr
usr
/
share
/
mysql
debian
/
additions
/
echo_stderr
usr
/
share
/
mysql
debian
/
additions
/
mysqld_safe_syslog
.
cnf
etc
/
mysql
/
conf
.
d
debian
/
additions
/
mysqld_safe_syslog
.
cnf
etc
/
mysql
/
conf
.
d
etc
/
apparmor
.
d
/
usr
.
sbin
.
mysqld
etc
/
apparmor
.
d
/
usr
.
sbin
.
mysqld
etc
/
security
/
user_map
.
conf
lib
/
systemd
/
system
/
mariadb
@
bootstrap
.
service
.
d
/
use_galera_new_cluster
.
conf
lib
/
systemd
/
system
/
mariadb
@
bootstrap
.
service
.
d
/
use_galera_new_cluster
.
conf
lib
/*/
security
/
pam_user_map
.
so
usr
/
bin
/
aria_chk
usr
/
bin
/
aria_chk
usr
/
bin
/
aria_dump_log
usr
/
bin
/
aria_dump_log
usr
/
bin
/
aria_ftdump
usr
/
bin
/
aria_ftdump
...
...
plugin/auth_pam/CMakeLists.txt
View file @
8870f18e
...
@@ -10,5 +10,15 @@ IF(HAVE_PAM_APPL_H)
...
@@ -10,5 +10,15 @@ IF(HAVE_PAM_APPL_H)
ENDIF
(
HAVE_STRNDUP
)
ENDIF
(
HAVE_STRNDUP
)
FIND_LIBRARY
(
PAM_LIBRARY pam
)
FIND_LIBRARY
(
PAM_LIBRARY pam
)
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
)
ADD_LIBRARY
(
pam_user_map MODULE mapper/pam_user_map.c
)
TARGET_LINK_LIBRARIES
(
pam_user_map pam
)
SET_TARGET_PROPERTIES
(
pam_user_map PROPERTIES PREFIX
""
)
IF
(
INSTALL_PAMDIR
)
INSTALL
(
TARGETS pam_user_map DESTINATION
${
INSTALL_PAMDIR
}
COMPONENT Server
)
INSTALL
(
FILES mapper/user_map.conf DESTINATION /etc/security COMPONENT Server
)
ENDIF
()
ENDIF
()
ENDIF
(
HAVE_PAM_APPL_H
)
ENDIF
(
HAVE_PAM_APPL_H
)
plugin/auth_pam/mapper/user_map.conf
0 → 100644
View file @
8870f18e
#
# Configuration file for pam_user_map.so
#
# defines mapping in the form
#
# orig_user_name: mapped_user_name
#
# or (to map all users in a specific group)
#
# @group_name: mapped_user_name
#
# comments and empty lines are ignored
#
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