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

Rename PLUGINDIR -> plugindir

Browse Source
This commit is contained in:
Todd C. Miller 2019-07-03 13:15:47 -06:00
parent caceced2f5
commit bb024cf093
10 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -682,7 +682,7 @@ OBJEXT
EXEEXT EXEEXT
ac_ct_CC ac_ct_CC
CC CC
PLUGINDIR plugindir
pam_login_service pam_login_service
pam_session pam_session
editor editor
@ -3123,7 +3123,7 @@ nsswitch_conf=/etc/nsswitch.conf
secure_path="not set" secure_path="not set"
pam_session=on pam_session=on
pam_login_service=sudo pam_login_service=sudo
PLUGINDIR="$libexecdir/sudo" plugindir="$libexecdir/sudo"
DIGEST=digest.lo DIGEST=digest.lo
devsearch="/dev/pts:/dev/vt:/dev/term:/dev/zcons:/dev/pty:/dev" devsearch="/dev/pts:/dev/vt:/dev/term:/dev/zcons:/dev/pty:/dev"
# #
@ -6035,7 +6035,7 @@ if test "${with_plugindir+set}" = set; then :
;; ;;
no) as_fn_error $? "\"--without-plugindir not supported.\"" "$LINENO" 5 no) as_fn_error $? "\"--without-plugindir not supported.\"" "$LINENO" 5
;; ;;
*) PLUGINDIR="$with_plugindir" *) plugindir="$with_plugindir"
;; ;;
esac esac
fi fi
@ -26913,11 +26913,11 @@ while test X"$sesh_file" != X"$_sesh_file"; do
eval sesh_file="$_sesh_file" eval sesh_file="$_sesh_file"
done done
# Update exec_prefix in PLUGINDIR # Update exec_prefix in plugindir
_PLUGINDIR= _plugindir=
while test X"$PLUGINDIR" != X"$_PLUGINDIR"; do while test X"$plugindir" != X"$_plugindir"; do
_PLUGINDIR="$PLUGINDIR" _plugindir="$plugindir"
eval PLUGINDIR="$_PLUGINDIR" eval plugindir="$_plugindir"
done done
exec_prefix="$oexec_prefix" exec_prefix="$oexec_prefix"
@ -26953,7 +26953,7 @@ EOF
fi fi
if test X"$enable_shared" != X"no"; then if test X"$enable_shared" != X"no"; then
cat >>confdefs.h <<EOF cat >>confdefs.h <<EOF
#define _PATH_SUDO_PLUGIN_DIR "$PLUGINDIR/" #define _PATH_SUDO_PLUGIN_DIR "$plugindir/"
EOF EOF

18
configure.ac
View File

@ -155,7 +155,7 @@ AC_SUBST([secure_path])
AC_SUBST([editor]) AC_SUBST([editor])
AC_SUBST([pam_session]) AC_SUBST([pam_session])
AC_SUBST([pam_login_service]) AC_SUBST([pam_login_service])
AC_SUBST([PLUGINDIR]) AC_SUBST([plugindir])
# #
# Begin initial values for man page substitution # Begin initial values for man page substitution
# #
@ -199,7 +199,7 @@ nsswitch_conf=/etc/nsswitch.conf
secure_path="not set" secure_path="not set"
pam_session=on pam_session=on
pam_login_service=sudo pam_login_service=sudo
PLUGINDIR="$libexecdir/sudo" plugindir="$libexecdir/sudo"
DIGEST=digest.lo DIGEST=digest.lo
devsearch="/dev/pts:/dev/vt:/dev/term:/dev/zcons:/dev/pty:/dev" devsearch="/dev/pts:/dev/vt:/dev/term:/dev/zcons:/dev/pty:/dev"
# #
@ -1253,7 +1253,7 @@ AC_ARG_WITH(plugindir, [AS_HELP_STRING([--with-plugindir=DIR], [set directory to
;; ;;
no) AC_MSG_ERROR(["--without-plugindir not supported."]) no) AC_MSG_ERROR(["--without-plugindir not supported."])
;; ;;
*) PLUGINDIR="$with_plugindir" *) plugindir="$with_plugindir"
;; ;;
esac]) esac])
@ -4394,11 +4394,11 @@ while test X"$sesh_file" != X"$_sesh_file"; do
eval sesh_file="$_sesh_file" eval sesh_file="$_sesh_file"
done done
# Update exec_prefix in PLUGINDIR # Update exec_prefix in plugindir
_PLUGINDIR= _plugindir=
while test X"$PLUGINDIR" != X"$_PLUGINDIR"; do while test X"$plugindir" != X"$_plugindir"; do
_PLUGINDIR="$PLUGINDIR" _plugindir="$plugindir"
eval PLUGINDIR="$_PLUGINDIR" eval plugindir="$_plugindir"
done done
exec_prefix="$oexec_prefix" exec_prefix="$oexec_prefix"
@ -4424,7 +4424,7 @@ else
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_SESH, NULL) SUDO_DEFINE_UNQUOTED(_PATH_SUDO_SESH, NULL)
fi fi
if test X"$enable_shared" != X"no"; then if test X"$enable_shared" != X"no"; then
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_PLUGIN_DIR, "$PLUGINDIR/") SUDO_DEFINE_UNQUOTED(_PATH_SUDO_PLUGIN_DIR, "$plugindir/")
AC_DEFINE(ENABLE_SUDO_PLUGIN_API, 1, [Define to 1 to enable sudo's plugin interface.]) AC_DEFINE(ENABLE_SUDO_PLUGIN_API, 1, [Define to 1 to enable sudo's plugin interface.])
else else
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_PLUGIN_DIR, NULL) SUDO_DEFINE_UNQUOTED(_PATH_SUDO_PLUGIN_DIR, NULL)

8
doc/sudo.conf.man.in
View File

@ -117,7 +117,7 @@ specified by the
\fIplugin_dir\fR \fIplugin_dir\fR
\fRPath\fR \fRPath\fR
setting, which defaults to setting, which defaults to
\fI@PLUGINDIR@\fR. \fI@plugindir@\fR.
In other words: In other words:
.nf .nf
.sp .sp
@ -130,7 +130,7 @@ is equivalent to:
.nf .nf
.sp .sp
.RS 6n .RS 6n
Plugin sudoers_policy @PLUGINDIR@/sudoers.so Plugin sudoers_policy @plugindir@/sudoers.so
.RE .RE
.fi .fi
.PP .PP
@ -295,7 +295,7 @@ plugin_dir
The default directory to use when searching for plugins The default directory to use when searching for plugins
that are specified without a fully qualified path name. that are specified without a fully qualified path name.
The default value is The default value is
\fI@PLUGINDIR@\fR. \fI@plugindir@\fR.
.if \n(SL \{\ .if \n(SL \{\
.TP 10n .TP 10n
sesh sesh
@ -650,7 +650,7 @@ front end configuration
# Debug sudo /var/log/sudo_debug all@warn # Debug sudo /var/log/sudo_debug all@warn
# Set disable_coredump true # Set disable_coredump true
# #
# The plugin_path is relative to @PLUGINDIR@ unless # The plugin_path is relative to @plugindir@ unless
# fully qualified. # fully qualified.
# The plugin_name corresponds to a global symbol in the plugin # The plugin_name corresponds to a global symbol in the plugin
# that contains the plugin interface structure. # that contains the plugin interface structure.

8
doc/sudo.conf.mdoc.in
View File

@ -114,7 +114,7 @@ specified by the
.Em plugin_dir .Em plugin_dir
.Li Path .Li Path
setting, which defaults to setting, which defaults to
.Pa @PLUGINDIR@ . .Pa @plugindir@ .
In other words: In other words:
.Bd -literal -offset indent .Bd -literal -offset indent
Plugin sudoers_policy sudoers.so Plugin sudoers_policy sudoers.so
@ -122,7 +122,7 @@ Plugin sudoers_policy sudoers.so
.Pp .Pp
is equivalent to: is equivalent to:
.Bd -literal -offset indent .Bd -literal -offset indent
Plugin sudoers_policy @PLUGINDIR@/sudoers.so Plugin sudoers_policy @plugindir@/sudoers.so
.Ed .Ed
.Pp .Pp
If the plugin was compiled statically into the If the plugin was compiled statically into the
@ -270,7 +270,7 @@ The default value is
The default directory to use when searching for plugins The default directory to use when searching for plugins
that are specified without a fully qualified path name. that are specified without a fully qualified path name.
The default value is The default value is
.Pa @PLUGINDIR@ . .Pa @plugindir@ .
.if \n(SL \{\ .if \n(SL \{\
.It sesh .It sesh
The fully-qualified path to the The fully-qualified path to the
@ -587,7 +587,7 @@ front end configuration
# Debug sudo /var/log/sudo_debug all@warn # Debug sudo /var/log/sudo_debug all@warn
# Set disable_coredump true # Set disable_coredump true
# #
# The plugin_path is relative to @PLUGINDIR@ unless # The plugin_path is relative to @plugindir@ unless
# fully qualified. # fully qualified.
# The plugin_name corresponds to a global symbol in the plugin # The plugin_name corresponds to a global symbol in the plugin
# that contains the plugin interface structure. # that contains the plugin interface structure.

4
doc/sudoers.man.in
View File

@ -3971,7 +3971,7 @@ A string containing a
group plugin with optional arguments. group plugin with optional arguments.
The string should consist of the plugin The string should consist of the plugin
path, either fully-qualified or relative to the path, either fully-qualified or relative to the
\fI@PLUGINDIR@\fR \fI@plugindir@\fR
directory, followed by any configuration arguments the plugin requires. directory, followed by any configuration arguments the plugin requires.
These arguments (if any) will be passed to the plugin's initialization function. These arguments (if any) will be passed to the plugin's initialization function.
If arguments are present, the string must be enclosed in double quotes If arguments are present, the string must be enclosed in double quotes
@ -4416,7 +4416,7 @@ Defaults setting.
The argument to The argument to
\fIgroup_plugin\fR \fIgroup_plugin\fR
should consist of the plugin path, either fully-qualified or relative to the should consist of the plugin path, either fully-qualified or relative to the
\fI@PLUGINDIR@\fR \fI@plugindir@\fR
directory, followed by any configuration options the plugin requires. directory, followed by any configuration options the plugin requires.
These options (if specified) will be passed to the plugin's initialization These options (if specified) will be passed to the plugin's initialization
function. function.

4
doc/sudoers.mdoc.in
View File

@ -3720,7 +3720,7 @@ A string containing a
group plugin with optional arguments. group plugin with optional arguments.
The string should consist of the plugin The string should consist of the plugin
path, either fully-qualified or relative to the path, either fully-qualified or relative to the
.Pa @PLUGINDIR@ .Pa @plugindir@
directory, followed by any configuration arguments the plugin requires. directory, followed by any configuration arguments the plugin requires.
These arguments (if any) will be passed to the plugin's initialization function. These arguments (if any) will be passed to the plugin's initialization function.
If arguments are present, the string must be enclosed in double quotes If arguments are present, the string must be enclosed in double quotes
@ -4122,7 +4122,7 @@ Defaults setting.
The argument to The argument to
.Em group_plugin .Em group_plugin
should consist of the plugin path, either fully-qualified or relative to the should consist of the plugin path, either fully-qualified or relative to the
.Pa @PLUGINDIR@ .Pa @plugindir@
directory, followed by any configuration options the plugin requires. directory, followed by any configuration options the plugin requires.
These options (if specified) will be passed to the plugin's initialization These options (if specified) will be passed to the plugin's initialization
function. function.

2
plugins/group_file/Makefile.in
View File

@ -87,7 +87,7 @@ sysconfdir = @sysconfdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
plugindir = @PLUGINDIR@ plugindir = @plugindir@
# File mode and map file to use for shared libraries/objects # File mode and map file to use for shared libraries/objects
shlib_enable = @SHLIB_ENABLE@ shlib_enable = @SHLIB_ENABLE@

2
plugins/sample/Makefile.in
View File

@ -86,7 +86,7 @@ sysconfdir = @sysconfdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
plugindir = @PLUGINDIR@ plugindir = @plugindir@
# File mode and map file to use for shared libraries/objects # File mode and map file to use for shared libraries/objects
shlib_enable = @SHLIB_ENABLE@ shlib_enable = @SHLIB_ENABLE@

2
plugins/sudoers/Makefile.in
View File

@ -124,7 +124,7 @@ shlib_map = sudoers.map
shlib_opt = sudoers.opt shlib_opt = sudoers.opt
# Directory in which to install the sudoers plugin # Directory in which to install the sudoers plugin
plugindir = @PLUGINDIR@ plugindir = @plugindir@
# Directory in which to install the sudoers file # Directory in which to install the sudoers file
sudoersdir = $(sysconfdir) sudoersdir = $(sysconfdir)

2
plugins/system_group/Makefile.in
View File

@ -87,7 +87,7 @@ sysconfdir = @sysconfdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
plugindir = @PLUGINDIR@ plugindir = @plugindir@
# File mode and map file to use for shared libraries/objects # File mode and map file to use for shared libraries/objects
shlib_enable = @SHLIB_ENABLE@ shlib_enable = @SHLIB_ENABLE@