diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 11:16:20 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 11:16:20 +0200 |
| commit | d4cb1776030b643895da0532b75c051f55e84356 (patch) | |
| tree | 67ca086a5e0e0f0b959c8dd2080009bd51dc6a9b /plugin | |
| parent | ca2695392411adc7f1d19f85d464213128e4f285 (diff) | |
| parent | 4da22738765ecc31fe9e253d349ca6e9d0f5d985 (diff) | |
| download | mariadb-git-d4cb1776030b643895da0532b75c051f55e84356.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_gssapi/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | plugin/cracklib_password_check/CMakeLists.txt | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/plugin/auth_gssapi/CMakeLists.txt b/plugin/auth_gssapi/CMakeLists.txt index 7fc0819a3b3..1bf727ddf2e 100644 --- a/plugin/auth_gssapi/CMakeLists.txt +++ b/plugin/auth_gssapi/CMakeLists.txt @@ -1,3 +1,9 @@ + +SET(CPACK_RPM_gssapi-server_PACKAGE_SUMMARY "GSSAPI authentication plugin for MariaDB server" PARENT_SCOPE) +SET(CPACK_RPM_gssapi-server_PACKAGE_DESCRIPTION "The gssapi authentication plugin allows the user to authenticate with services +that use the Generic Security Services Application Program Interface (GSSAPI). +The gssapi authentication plugin is most often used for authenticating with Microsoft Active Directory." PARENT_SCOPE) + IF (WIN32) SET(USE_SSPI 1) ENDIF() diff --git a/plugin/cracklib_password_check/CMakeLists.txt b/plugin/cracklib_password_check/CMakeLists.txt index 81db865eae0..620234ccd3f 100644 --- a/plugin/cracklib_password_check/CMakeLists.txt +++ b/plugin/cracklib_password_check/CMakeLists.txt @@ -1,6 +1,10 @@ INCLUDE (CheckIncludeFiles) INCLUDE (CheckLibraryExists) +SET(CPACK_RPM_cracklib-password-check_PACKAGE_SUMMARY "CrackLib Password Validation Plugin for MariaDB" PARENT_SCOPE) +SET(CPACK_RPM_cracklib-password-check_PACKAGE_DESCRIPTION "This password validation plugin uses cracklib to allow only +sufficiently secure (as defined by cracklib) user passwords in MariaDB." PARENT_SCOPE) + CHECK_LIBRARY_EXISTS(crack FascistCheckUser "" HAVE_LIBCRACK) SET(CMAKE_REQUIRED_DEFINITIONS -Dsize_t=int) # debian hack, debian bug. |