736c4c1655
FreeRADIUS is an open source server which implements a protocol for remote user Authorization, Authentication and Accounting. There are many modules. All modules without dependencies are enabled. The modules with a dependency that we have are automatically enabled if the dependency is enabled. Modules with dependencies we don't support are explicitly disabled. The configure script always looks in host directories for libraries, so it is essential to explicitly disable everything that is not actually provided. Signed-off-by: David GOUARIN <dgouarin@gmail.com> Signed-off-by: Kalpesh Panchal <kalpesh.panchal@rockwellcollins.com> Signed-off-by: Matt Weber <matthew.weber@collins.com> [Arnout: - remove second patch, superseded by other patches; - add upstream links to patches; - add more patches to avoid looking in host directories; - explicitly add dependency on !static inherited from talloc (redundant with glibc, but future-safe); - simplify Config.in comment; - check hash with PGP signature; - add conf opts for runtime paths; - add conf opts to disable unsupported modules; - add more optional dependencies; - enable/disable all modules that use a dependency; - search defaults file in /etc/default, not /etc/sysconfig. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From 77b8c75f9904897768f87e20fef5d7739ddcd3c7 Mon Sep 17 00:00:00 2001
|
|
From: Jared Bents <jared.bents@rockwellcollins.com>
|
|
Date: Tue, 4 Feb 2020 08:22:11 -0600
|
|
Subject: [PATCH] modules/rlm_sql: remove mysql_version.h
|
|
|
|
remove mysql_version.h as mysql.h is included and mysql_version.h
|
|
should not be included by per the header file warning
|
|
|
|
Upstream: http://lists.freeradius.org/pipermail/freeradius-devel/2021-April/014218.html
|
|
|
|
Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>
|
|
Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
|
|
[Applied upstream as https://github.com/FreeRADIUS/freeradius-server/commit/f20e80fce5f1b0589dccdf441b5d835188c0dfa2]
|
|
---
|
|
src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
|
|
index a7992647cd..ea44d0cc7a 100644
|
|
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
|
|
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
|
|
@@ -34,12 +34,10 @@ RCSID("$Id$")
|
|
#include "config.h"
|
|
|
|
#ifdef HAVE_MYSQL_MYSQL_H
|
|
-# include <mysql/mysql_version.h>
|
|
# include <mysql/errmsg.h>
|
|
# include <mysql/mysql.h>
|
|
# include <mysql/mysqld_error.h>
|
|
#elif defined(HAVE_MYSQL_H)
|
|
-# include <mysql_version.h>
|
|
# include <errmsg.h>
|
|
# include <mysql.h>
|
|
# include <mysqld_error.h>
|
|
--
|
|
2.17.1
|
|
|