Remove module config for python path

diff --git a/raddb/mods-available/python b/raddb/mods-available/python
index fad7008fd10afb006d6beb40549a0486b8fd68cb..db6241082b1adf05593a138a62962dfcdd93b58b 100644 (file)
--- a/raddb/mods-available/python
+++ b/raddb/mods-available/python
@@ -60,29 +60,6 @@ python {
        #
 #      cext_compat = false
 
-       #
-       #  python_path::
-       #
-       #  The search path for Python modules.  It must include the path to your
-       #  Python module.
-       #
-#      python_path = ${modconfdir}/${.:name}
-
-       #
-       #  python_path_include_conf_dir::
-       #
-       #  If "yes", include the directory containing this file in Python's
-       #  module search path.
-       #
-#      python_path_include_conf_dir = "yes"
-
-       #
-       #  python_path_include_default::
-       #
-       #  If "yes", retain the default search path.  Any additional search
-       #  path components will be prepended to the the default search path.
-       #
-#      python_path_include_default = "yes"
        #
        #  [NOTE]
        #  ====

diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c
index d661514461e2829b0c5837f6bab04c633ba47122..61d9e243d99982261f8832369735342723e40f10 100644 (file)
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -57,11 +57,6 @@ typedef struct {
 typedef struct {
        char const      *name;                  //!< Name of the module instance
        PyThreadState   *interpreter;           //!< The interpreter used for this instance of rlm_python.
-       char const      *python_path;           //!< Path to search for python files in.
-       bool            python_path_include_conf_dir;   //!< Include the directory of the current
-                                                       ///< rlm_python module config in the python path.
-       bool            python_path_include_default;    //!< Include the default python path
-                                                       ///< in the python path.
        PyObject        *module;                //!< Local, interpreter specific module.
 
        python_func_def_t
@@ -165,10 +160,6 @@ static CONF_PARSER module_config[] = {
 
 #undef A
 
-       { FR_CONF_OFFSET("python_path", FR_TYPE_STRING, rlm_python_t, python_path) },
-       { FR_CONF_OFFSET("python_path_include_conf_dir", FR_TYPE_BOOL, rlm_python_t, python_path_include_conf_dir), .dflt = "yes" },
-       { FR_CONF_OFFSET("python_path_include_default", FR_TYPE_BOOL, rlm_python_t, python_path_include_default), .dflt = "yes" },
-
        CONF_PARSER_TERMINATOR
 };