diff --git a/plugins/python/example_io_plugin.py b/plugins/python/example_io_plugin.py index 5bbd32ecc..b88f8e011 100644 --- a/plugins/python/example_io_plugin.py +++ b/plugins/python/example_io_plugin.py @@ -107,7 +107,7 @@ class SudoIOPlugin(sudo.Plugin): self._log("SUSPEND", signal_description) def show_version(self, is_verbose: int) -> int: - sudo.log_info("Python IO Plugin version: {}".format(VERSION)) + sudo.log_info("Python Example IO Plugin version: {}".format(VERSION)) if is_verbose: sudo.log_info("Python interpreter version:", sys.version) diff --git a/plugins/python/example_policy_plugin.py b/plugins/python/example_policy_plugin.py index 570dc96b0..11c6905ec 100644 --- a/plugins/python/example_policy_plugin.py +++ b/plugins/python/example_policy_plugin.py @@ -122,7 +122,7 @@ class SudoPolicyPlugin(sudo.Plugin): pass # we have no cache def show_version(self, is_verbose: int): - sudo.log_info("Python Policy Plugin version: {}".format(VERSION)) + sudo.log_info("Python Example Policy Plugin version: {}".format(VERSION)) if is_verbose: sudo.log_info("Python interpreter version:", sys.version) diff --git a/plugins/python/python_plugin_common.c b/plugins/python/python_plugin_common.c index d7cb69e33..70ad06cc0 100644 --- a/plugins/python/python_plugin_common.c +++ b/plugins/python/python_plugin_common.c @@ -401,7 +401,6 @@ python_plugin_show_version(struct PluginContext *plugin_ctx, const char *python_ { debug_decl(python_plugin_show_version, PYTHON_DEBUG_CALLBACKS); - py_sudo_log(SUDO_CONV_INFO_MSG, "Python language plugin version %s\n", PACKAGE_VERSION); debug_return_int(python_plugin_api_rc_call(plugin_ctx, python_callback_name, Py_BuildValue("(i)", is_verbose))); } diff --git a/plugins/python/python_plugin_io.c b/plugins/python/python_plugin_io.c index 5d683e624..784bffc92 100644 --- a/plugins/python/python_plugin_io.c +++ b/plugins/python/python_plugin_io.c @@ -129,6 +129,13 @@ int python_plugin_io_show_version(int verbose) { debug_decl(python_plugin_io_show_version, PYTHON_DEBUG_CALLBACKS); + + if (verbose) { + py_sudo_log(SUDO_CONV_INFO_MSG, "Python io plugin API version %d.%d\n", "%d.%d", + SUDO_API_VERSION_GET_MAJOR(PY_IO_PLUGIN_VERSION), + SUDO_API_VERSION_GET_MINOR(PY_IO_PLUGIN_VERSION)); + } + debug_return_int(python_plugin_show_version(&plugin_ctx, CALLBACK_PYNAME(show_version), verbose)); } diff --git a/plugins/python/python_plugin_policy.c b/plugins/python/python_plugin_policy.c index 24aa4b043..21883cefc 100644 --- a/plugins/python/python_plugin_policy.c +++ b/plugins/python/python_plugin_policy.c @@ -187,6 +187,12 @@ python_plugin_policy_version(int verbose) { debug_decl(python_plugin_policy_version, PYTHON_DEBUG_CALLBACKS); + if (verbose) { + py_sudo_log(SUDO_CONV_INFO_MSG, "Python policy plugin API version %d.%d\n", "%d.%d", + SUDO_API_VERSION_GET_MAJOR(PY_POLICY_PLUGIN_VERSION), + SUDO_API_VERSION_GET_MINOR(PY_POLICY_PLUGIN_VERSION)); + } + debug_return_int(python_plugin_show_version(&plugin_ctx, CALLBACK_PYNAME(show_version), verbose)); }