Merge branch '10.2' into 10.3

plugin/auth_pam/CMakeLists.txt

@@ -10,5 +10,15 @@ IF(HAVE_PAM_APPL_H)
   ENDIF(HAVE_STRNDUP)
   FIND_LIBRARY(PAM_LIBRARY pam)
   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)
 

plugin/auth_pam/mapper/user_map.conf

@@ -0,0 +1,13 @@
+#
+# 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
+#