diff --git a/MANIFEST b/MANIFEST index 23e0d9e63..9c6a4cdc9 100644 --- a/MANIFEST +++ b/MANIFEST @@ -331,6 +331,7 @@ plugins/python/python_baseplugin.c plugins/python/python_convmessage.c plugins/python/python_importblocker.c plugins/python/python_loghandler.c +plugins/python/python_plugin.exp.in plugins/python/python_plugin_approval.c plugins/python/python_plugin_approval_multi.inc plugins/python/python_plugin_audit.c diff --git a/configure b/configure index 697d56f6a..a4bef163c 100755 --- a/configure +++ b/configure @@ -19215,7 +19215,7 @@ fi PPFILES="$PPFILES "'$(srcdir)/etc/sudo-python.pp' PYTHON_PLUGIN_SRC=plugins/python - ac_config_files="$ac_config_files $PYTHON_PLUGIN_SRC/Makefile" + ac_config_files="$ac_config_files $PYTHON_PLUGIN_SRC/Makefile $PYTHON_PLUGIN_SRC/python_plugin.exp" fi @@ -29014,6 +29014,7 @@ do "pathnames.h") CONFIG_HEADERS="$CONFIG_HEADERS pathnames.h" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "$PYTHON_PLUGIN_SRC/Makefile") CONFIG_FILES="$CONFIG_FILES $PYTHON_PLUGIN_SRC/Makefile" ;; + "$PYTHON_PLUGIN_SRC/python_plugin.exp") CONFIG_FILES="$CONFIG_FILES $PYTHON_PLUGIN_SRC/python_plugin.exp" ;; "lib/zlib/zconf.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/zlib/zconf.h" ;; "lib/zlib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/zlib/Makefile" ;; "etc/init.d/$INIT_SCRIPT") CONFIG_FILES="$CONFIG_FILES etc/init.d/$INIT_SCRIPT" ;; diff --git a/configure.ac b/configure.ac index 098b61b02..c6ab6d087 100644 --- a/configure.ac +++ b/configure.ac @@ -2599,7 +2599,7 @@ if test ${USE_PYTHON-'no'} = "yes"; then PPFILES="$PPFILES "'$(srcdir)/etc/sudo-python.pp' PYTHON_PLUGIN_SRC=plugins/python - AC_CONFIG_FILES([$PYTHON_PLUGIN_SRC/Makefile]) + AC_CONFIG_FILES([$PYTHON_PLUGIN_SRC/Makefile $PYTHON_PLUGIN_SRC/python_plugin.exp]) fi dnl diff --git a/plugins/python/python_plugin.exp.in b/plugins/python/python_plugin.exp.in new file mode 100644 index 000000000..1261a58b7 --- /dev/null +++ b/plugins/python/python_plugin.exp.in @@ -0,0 +1,8 @@ +group_plugin +python_approval +python_approval_clone +python_audit +python_audit_clone +python_io +python_io_clone +python_policy diff --git a/plugins/python/python_plugin_approval_multi.inc b/plugins/python/python_plugin_approval_multi.inc index 9f0ceb958..6ee16bebf 100644 --- a/plugins/python/python_plugin_approval_multi.inc +++ b/plugins/python/python_plugin_approval_multi.inc @@ -43,7 +43,7 @@ CALLBACK_CFUNC(show_version)(int verbose) return python_plugin_approval_show_version(&PLUGIN_CTX, verbose); } -__dso_public struct approval_plugin APPROVAL_SYMBOL_NAME(python_approval) = { +struct approval_plugin APPROVAL_SYMBOL_NAME(python_approval) = { SUDO_APPROVAL_PLUGIN, SUDO_API_VERSION, CALLBACK_CFUNC(open), diff --git a/plugins/python/python_plugin_audit_multi.inc b/plugins/python/python_plugin_audit_multi.inc index e64038945..bb65f9ee8 100644 --- a/plugins/python/python_plugin_audit_multi.inc +++ b/plugins/python/python_plugin_audit_multi.inc @@ -60,7 +60,7 @@ CALLBACK_CFUNC(show_version)(int verbose) return python_plugin_audit_show_version(&PLUGIN_CTX, verbose); } -__dso_public struct audit_plugin AUDIT_SYMBOL_NAME(python_audit) = { +struct audit_plugin AUDIT_SYMBOL_NAME(python_audit) = { SUDO_AUDIT_PLUGIN, SUDO_API_VERSION, CALLBACK_CFUNC(open),