diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 10:33:06 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 10:33:06 +0200 |
commit | 289721de9aca8cdf3bdef1a010477e2d38eebb8d (patch) | |
tree | 50a9f9ea56a7a0b68210e1061ced47951298d2d9 /plugin | |
parent | 9962cda52722b77c2a7e0314bbaa2e4f963f55c1 (diff) | |
parent | f5441ef4dac9f3fd5dfe1bfa25a514715fee649f (diff) | |
download | mariadb-git-289721de9aca8cdf3bdef1a010477e2d38eebb8d.tar.gz |
Merge 10.2 into 10.3
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 11063df0884..1110562d9f1 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. |