[rs-commit] r239 - in /mod_ca/trunk: ChangeLog config.h.in configure configure.ac mod_ca_disk.c

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Sun Jan  5 00:06:56 2020
New Revision: 239

Log:
apr_file_link() is not supported on apr < 1.4.

Modified:
    mod_ca/trunk/ChangeLog
    mod_ca/trunk/config.h.in
    mod_ca/trunk/configure
    mod_ca/trunk/configure.ac
    mod_ca/trunk/mod_ca_disk.c

Modified: mod_ca/trunk/ChangeLog
==============================================================================
--- mod_ca/trunk/ChangeLog	(original)
+++ mod_ca/trunk/ChangeLog	Sun Jan  5 00:06:56 2020
@@ -1,5 +1,8 @@
 
 Changes with v0.2.2
+
+ *) apr_file_link() is not supported on apr < 1.4. [Graham
+    Leggett]
 
  *) Support platforms where apr_crypto_clear() is not present.
     [Graham Leggett]

Modified: mod_ca/trunk/config.h.in
==============================================================================
--- mod_ca/trunk/config.h.in	(original)
+++ mod_ca/trunk/config.h.in	Sun Jan  5 00:06:56 2020
@@ -5,6 +5,9 @@
 
 /* Define to 1 if you have the <apr_crypto.h> header file. */
 #undef HAVE_APR_CRYPTO_H
+
+/* Define to 1 if you have the `apr_file_link' function. */
+#undef HAVE_APR_FILE_LINK
 
 /* Define to 1 if you have the <apr_hash.h> header file. */
 #undef HAVE_APR_HASH_H

Modified: mod_ca/trunk/configure
==============================================================================
--- mod_ca/trunk/configure	(original)
+++ mod_ca/trunk/configure	Sun Jan  5 00:06:56 2020
@@ -4926,7 +4926,7 @@
 
 
 # Checks for library functions.
-for ac_func in apr_crypto_clear X509_REVOKED_get0_revocationDate X509_REVOKED_get0_serialNumber ASN1_STRING_get0_data X509_CRL_get0_lastUpdate X509_CRL_get0_nextUpdate
+for ac_func in apr_file_link apr_crypto_clear X509_REVOKED_get0_revocationDate X509_REVOKED_get0_serialNumber ASN1_STRING_get0_data X509_CRL_get0_lastUpdate X509_CRL_get0_nextUpdate
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

Modified: mod_ca/trunk/configure.ac
==============================================================================
--- mod_ca/trunk/configure.ac	(original)
+++ mod_ca/trunk/configure.ac	Sun Jan  5 00:06:56 2020
@@ -61,7 +61,7 @@
 AC_TYPE_SIZE_T
 
 # Checks for library functions.
-AC_CHECK_FUNCS([apr_crypto_clear X509_REVOKED_get0_revocationDate X509_REVOKED_get0_serialNumber ASN1_STRING_get0_data X509_CRL_get0_lastUpdate X509_CRL_get0_nextUpdate])
+AC_CHECK_FUNCS([apr_file_link apr_crypto_clear X509_REVOKED_get0_revocationDate X509_REVOKED_get0_serialNumber ASN1_STRING_get0_data X509_CRL_get0_lastUpdate X509_CRL_get0_nextUpdate])
 
 AC_SUBST(PACKAGE_VERSION)
 AC_OUTPUT

Modified: mod_ca/trunk/mod_ca_disk.c
==============================================================================
--- mod_ca/trunk/mod_ca_disk.c	(original)
+++ mod_ca/trunk/mod_ca_disk.c	Sun Jan  5 00:06:56 2020
@@ -635,8 +635,12 @@
 
     /* do we have a link? create it now */
     if (link) {
-        status = apr_file_link(path, link);
-        if (APR_SUCCESS != status) {
+#if HAVE_APR_FILE_LINK
+    	status = apr_file_link(path, link);
+#else
+        status = APR_ENOTIMPL;
+#endif
+    	if (APR_SUCCESS != status) {
             log_message(r, status,
                     "Could not link the certificate file to the CADiskCertificateByTransactionPath");