diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-01-27 01:03:25 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-02-04 11:40:37 +0100 |
| commit | 08fd4a51ed2390a7af803faca81108e0a6a91c0f (patch) | |
| tree | cac71c83e27d308f3b2d28f76c4aed57d29f8bf8 /src | |
| parent | 6d8d495faf0a8670d1657ec4dc0fb84f3e3d249a (diff) | |
| download | libtdeldap-08fd4a51ed2390a7af803faca81108e0a6a91c0f.tar.gz libtdeldap-08fd4a51ed2390a7af803faca81108e0a6a91c0f.zip | |
Update CMake rules
+ Prefer Heimdal during Kerberos detection.
+ Add a check whether the Kerberos is Heimdal.
+ Add a check whether the compiler supports the option -fpermissive.
+ Add an option for the user to specify SYSTEM_CA_STORE_REGENERATE_COMMAND.
+ Set the library version to 1.0.0.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/libtdeldap.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a8db41b..8395331 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,6 +11,7 @@ include_directories( link_directories( ${TQT_LIBRARY_DIRS} ${TDE_LIB_DIR} + ${KRB5_LIBRARY_DIRS} ) @@ -30,9 +31,10 @@ tde_add_library( tdeldap SHARED AUTOMOC tdesu krb5 kadm5clnt kadm5srv hdb lber ldap - + + VERSION 1.0.0 DESTINATION ${LIB_INSTALL_DIR} -) +) ##### headers diff --git a/src/libtdeldap.cpp b/src/libtdeldap.cpp index 236f307..0c130bd 100644 --- a/src/libtdeldap.cpp +++ b/src/libtdeldap.cpp @@ -124,7 +124,9 @@ extern "C" { #define SYSTEM_CA_STORE_CERT_LOCATION "/usr/local/share/ca-certificates/" #endif +#ifndef SYSTEM_CA_STORE_REGENERATE_COMMAND #define SYSTEM_CA_STORE_REGENERATE_COMMAND "update-ca-certificates" +#endif #ifndef CRON_UPDATE_PRIMARY_REALM_CERTIFICATES_OPENLDAP_RELOAD_COMMAND #define CRON_UPDATE_PRIMARY_REALM_CERTIFICATES_OPENLDAP_RELOAD_COMMAND "/etc/init.d/slapd force-reload" |