mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

Add missing python_plugin.exp.in file and remove unneeded __dso_public

Browse Source 
This fixes building the python plugin on systems where the compiler
doesn't support symbol hiding (but wherethe linker does).
This commit is contained in:
Todd C. Miller 2020-08-03 09:53:12 -06:00
parent 974f833e17
commit 3b4d4ab8dd
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST
View File

@ -331,6 +331,7 @@ plugins/python/python_baseplugin.c
plugins/python/python_convmessage.c plugins/python/python_convmessage.c
plugins/python/python_importblocker.c plugins/python/python_importblocker.c
plugins/python/python_loghandler.c plugins/python/python_loghandler.c
plugins/python/python_plugin.exp.in
plugins/python/python_plugin_approval.c plugins/python/python_plugin_approval.c
plugins/python/python_plugin_approval_multi.inc plugins/python/python_plugin_approval_multi.inc
plugins/python/python_plugin_audit.c plugins/python/python_plugin_audit.c

3
configure vendored
View File

@ -19215,7 +19215,7 @@ fi
PPFILES="$PPFILES "'$(srcdir)/etc/sudo-python.pp' PPFILES="$PPFILES "'$(srcdir)/etc/sudo-python.pp'
PYTHON_PLUGIN_SRC=plugins/python 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 fi
@ -29014,6 +29014,7 @@ do
"pathnames.h") CONFIG_HEADERS="$CONFIG_HEADERS pathnames.h" ;; "pathnames.h") CONFIG_HEADERS="$CONFIG_HEADERS pathnames.h" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"$PYTHON_PLUGIN_SRC/Makefile") CONFIG_FILES="$CONFIG_FILES $PYTHON_PLUGIN_SRC/Makefile" ;; "$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/zconf.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/zlib/zconf.h" ;;
"lib/zlib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/zlib/Makefile" ;; "lib/zlib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/zlib/Makefile" ;;
"etc/init.d/$INIT_SCRIPT") CONFIG_FILES="$CONFIG_FILES etc/init.d/$INIT_SCRIPT" ;; "etc/init.d/$INIT_SCRIPT") CONFIG_FILES="$CONFIG_FILES etc/init.d/$INIT_SCRIPT" ;;

2
configure.ac
View File

@ -2599,7 +2599,7 @@ if test ${USE_PYTHON-'no'} = "yes"; then
PPFILES="$PPFILES "'$(srcdir)/etc/sudo-python.pp' PPFILES="$PPFILES "'$(srcdir)/etc/sudo-python.pp'
PYTHON_PLUGIN_SRC=plugins/python 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 fi
dnl dnl

8
plugins/python/python_plugin.exp.in Normal file
View File

@ -0,0 +1,8 @@
group_plugin
python_approval
python_approval_clone
python_audit
python_audit_clone
python_io
python_io_clone
python_policy

2
plugins/python/python_plugin_approval_multi.inc
View File

@ -43,7 +43,7 @@ CALLBACK_CFUNC(show_version)(int verbose)
return python_plugin_approval_show_version(&PLUGIN_CTX, 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_APPROVAL_PLUGIN,
SUDO_API_VERSION, SUDO_API_VERSION,
CALLBACK_CFUNC(open), CALLBACK_CFUNC(open),

2
plugins/python/python_plugin_audit_multi.inc
View File

@ -60,7 +60,7 @@ CALLBACK_CFUNC(show_version)(int verbose)
return python_plugin_audit_show_version(&PLUGIN_CTX, 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_AUDIT_PLUGIN,
SUDO_API_VERSION, SUDO_API_VERSION,
CALLBACK_CFUNC(open), CALLBACK_CFUNC(open),