From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Thu, 30 Jan 2025 19:30:50 +0000 (+0000)
Subject: rlm_couchbase: we can't build on couchbase v3
X-Git-Tag: release_3_2_7~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0d0b03000eecc822820e63ef30db0309fdbee4e;p=thirdparty%2Ffreeradius-server.git

rlm_couchbase: we can't build on couchbase v3
---

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e45e142397..1b01c3720d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -58,6 +58,7 @@ FreeRADIUS 3.2.7 Sat 24 Aug 2024 12:00:00 UTC urgency=low
 	* Correct calculation of EAP length in pre-proxy.  Fixes #5486.
 	* Don't segfault when using detail listeners. Fixes #5485
 	* radlast is no longer installed if "last" is not present.
+	* Add check for Couchbase v2, rlm_couchbase won't build on v3.
 
 FreeRADIUS 3.2.6 Sat 24 Aug 2024 12:00:00 UTC urgency=low
 	Configuration changes
diff --git a/src/modules/rlm_couchbase/configure b/src/modules/rlm_couchbase/configure
index 4677477653..c6b9e887c1 100755
--- a/src/modules/rlm_couchbase/configure
+++ b/src/modules/rlm_couchbase/configure
@@ -3798,6 +3798,39 @@ fail="$fail couchbase.h"
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcb_t in couchbase.h" >&5
+$as_echo_n "checking for lcb_t in couchbase.h... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <libcouchbase/couchbase.h>
+int
+main ()
+{
+
+		lcb_t *instance;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fail="$fail lcb_t(couchbase-2.x)"
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
 smart_try_dir="$libcouchbase_lib_dir"
 
 
diff --git a/src/modules/rlm_couchbase/configure.ac b/src/modules/rlm_couchbase/configure.ac
index 453b92a8e5..414b888ff4 100644
--- a/src/modules/rlm_couchbase/configure.ac
+++ b/src/modules/rlm_couchbase/configure.ac
@@ -180,6 +180,22 @@ if test "x$ac_cv_header_libcouchbase_couchbase_h" != "xyes"; then
 	FR_MODULE_FAIL([couchbase.h])
 fi
 
+dnl # lcb_t is in couchbase v2, so if the system is v3 we can't build
+
+AC_MSG_CHECKING([for lcb_t in couchbase.h])
+AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM([#include <libcouchbase/couchbase.h>], [[
+		lcb_t *instance;
+	]])],
+	[
+		AC_MSG_RESULT(yes)
+	],
+	[
+		AC_MSG_RESULT(no)
+		FR_MODULE_FAIL([lcb_t(couchbase-2.x)])
+	])
+
+
 dnl ############################################################
 dnl # Check for libcouchbase libraries
 dnl ############################################################