Use PLUGINDIR in the manuals and fix a typo in the sample sudo.conf.

diff --git a/configure b/configure
index e69ae7cbc8c541cd0c1f016eb2edd3deea523d59..3a84d37b384aacb495def00caa7edf8668365135 100755 (executable)
--- a/configure
+++ b/configure
@@ -658,6 +658,7 @@ OBJEXT
 EXEEXT
 ac_ct_CC
 CC
+PLUGINDIR
 editor
 secure_path
 netsvc_conf
@@ -719,7 +720,6 @@ DONT_LEAK_PATH_INFO
 INSTALL_NOEXEC
 noexec_file
 SOEXT
-PLUGINDIR
 NOEXECDIR
 NOEXECFILE
 mansrcdir
@@ -2963,6 +2963,7 @@ netsvc_conf=/etc/netsvc.conf
 noexec_file=/usr/local/libexec/sudo_noexec.so
 nsswitch_conf=/etc/nsswitch.conf
 secure_path="not set"
+PLUGINDIR=/usr/local/libexec
 #
 # End initial values for man page substitution
 #

diff --git a/configure.in b/configure.in
index 246d65406727a6232eda228759e71d81851371be..dbb1ede1f99ec84bcfca573595feafbc4f2d4060 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -56,7 +56,6 @@ AC_SUBST([mansectform])
 AC_SUBST([mansrcdir])
 AC_SUBST([NOEXECFILE])
 AC_SUBST([NOEXECDIR])
-AC_SUBST([PLUGINDIR])
 AC_SUBST([SOEXT])
 AC_SUBST([noexec_file])
 AC_SUBST([INSTALL_NOEXEC])
@@ -121,6 +120,7 @@ AC_SUBST([nsswitch_conf])
 AC_SUBST([netsvc_conf])
 AC_SUBST([secure_path])
 AC_SUBST([editor])
+AC_SUBST([PLUGINDIR])
 #
 # Begin initial values for man page substitution
 #
@@ -160,6 +160,7 @@ netsvc_conf=/etc/netsvc.conf
 noexec_file=/usr/local/libexec/sudo_noexec.so
 nsswitch_conf=/etc/nsswitch.conf
 secure_path="not set"
+PLUGINDIR=/usr/local/libexec
 #
 # End initial values for man page substitution
 #

diff --git a/doc/sample.sudo.conf b/doc/sample.sudo.conf
index 3672bcbad94560ff9b010aaaf3b35f528a6f3940..0724c25031c2ba4aa447a7c11a81d0c9692f08d8 100644 (file)
--- a/doc/sample.sudo.conf
+++ b/doc/sample.sudo.conf
@@ -24,7 +24,7 @@ Plugin sudoers_io sudoers.so
 #
 # An askpass helper program may be specified to provide a graphical
 # password prompt for "sudo -A" support.  Sudo does not ship with its
-# own passpass program but can use the OpenSSH askpass.
+# own askpass program but can use the OpenSSH askpass.
 #
 # Use the OpenSSH askpass
 #Path askpass /usr/X11R6/bin/ssh-askpass

diff --git a/doc/sudo.man.in b/doc/sudo.man.in
index 5ca31c68cfb878195f4ce1960dad28ff2619f4b6..bd64ad4e2122a9ebb8f8cc5ab8b54f56c7a6d988 100644 (file)
--- a/doc/sudo.man.in
+++ b/doc/sudo.man.in
@@ -851,7 +851,7 @@ file.
 #   Debug sudo /var/log/sudo_debug all@warn
 #   Set disable_coredump true
 #
-# The plugin_path is relative to @prefix@/libexec unless
+# The plugin_path is relative to @PLUGINDIR@ unless
 #   fully qualified.
 # The plugin_name corresponds to a global symbol in the plugin
 #   that contains the plugin interface structure.
@@ -882,7 +882,7 @@ The
 \fIpath\fR
 may be fully qualified or relative.
 If not fully qualified it is relative to the
-\fI@prefix@/libexec\fR
+\fI@PLUGINDIR@\fR
 directory.
 Any additional parameters after the
 \fIpath\fR

diff --git a/doc/sudo.mdoc.in b/doc/sudo.mdoc.in
index f72761102be50468e82d2eff3eb064180c90a7dd..095b3b90cf3a225408f46b8648f9bb227e95830e 100644 (file)
--- a/doc/sudo.mdoc.in
+++ b/doc/sudo.mdoc.in
@@ -833,7 +833,7 @@ file.
 #   Debug sudo /var/log/sudo_debug all@warn
 #   Set disable_coredump true
 #
-# The plugin_path is relative to @prefix@/libexec unless
+# The plugin_path is relative to @PLUGINDIR@ unless
 #   fully qualified.
 # The plugin_name corresponds to a global symbol in the plugin
 #   that contains the plugin interface structure.
@@ -863,7 +863,7 @@ The
 .Em path
 may be fully qualified or relative.
 If not fully qualified it is relative to the
-.Pa @prefix@/libexec
+.Pa @PLUGINDIR@
 directory.
 Any additional parameters after the
 .Em path

diff --git a/doc/sudo_plugin.man.in b/doc/sudo_plugin.man.in
index b800da4141abc4576b521e13ca234b1da03f5aec..b4716957d6843361b84220f4761c831fc82e00ea 100644 (file)
--- a/doc/sudo_plugin.man.in
+++ b/doc/sudo_plugin.man.in
@@ -78,7 +78,7 @@ The
 \fIpath\fR
 may be fully qualified or relative.
 If not fully qualified it is relative to the
-\fI@prefix@/libexec\fR
+\fI@PLUGINDIR@\fR
 directory.
 Any additional parameters after the
 \fIpath\fR
@@ -112,7 +112,7 @@ This limitation does not apply to I/O plugins.
 #   Debug sudo /var/log/sudo_debug all@warn
 #   Set disable_coredump true
 #
-# The plugin_path is relative to @prefix@/libexec unless
+# The plugin_path is relative to @PLUGINDIR@ unless
 #   fully qualified.
 # The plugin_name corresponds to a global symbol in the plugin
 #   that contains the plugin interface structure.

diff --git a/doc/sudo_plugin.mdoc.in b/doc/sudo_plugin.mdoc.in
index 946d69d048bbdabde7e5fb4888022746318ee86c..4b1b602de2b459465c84ac33c8de15021d3ea34e 100644 (file)
--- a/doc/sudo_plugin.mdoc.in
+++ b/doc/sudo_plugin.mdoc.in
@@ -76,7 +76,7 @@ The
 .Em path
 may be fully qualified or relative.
 If not fully qualified it is relative to the
-.Pa @prefix@/libexec
+.Pa @PLUGINDIR@
 directory.
 Any additional parameters after the
 .Em path
@@ -108,7 +108,7 @@ This limitation does not apply to I/O plugins.
 #   Debug sudo /var/log/sudo_debug all@warn
 #   Set disable_coredump true
 #
-# The plugin_path is relative to @prefix@/libexec unless
+# The plugin_path is relative to @PLUGINDIR@ unless
 #   fully qualified.
 # The plugin_name corresponds to a global symbol in the plugin
 #   that contains the plugin interface structure.

diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index c41af45a9bc562da1aeff1ba7c5e08cb0f127dac..d28e02802cf267241261df2c299a9197490eee92 100644 (file)
--- a/doc/sudoers.man.in
+++ b/doc/sudoers.man.in
@@ -2830,7 +2830,7 @@ This can be used to implement support for the
 syntax described earlier.
 The string should consist of the plugin
 path, either fully-qualified or relative to the
-\fI@prefix@/libexec\fR
+\fI@PLUGINDIR@\fR
 directory, followed by any configuration arguments the plugin requires.
 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
@@ -3501,7 +3501,7 @@ file.
 #   Debug sudo /var/log/sudo_debug all@warn
 #   Set disable_coredump true
 #
-# The plugin_path is relative to @prefix@/libexec unless
+# The plugin_path is relative to @PLUGINDIR@ unless
 #   fully qualified.
 # The plugin_name corresponds to a global symbol in the plugin
 #   that contains the plugin interface structure.

diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index 8f76634dbdb32d052ddc7a868f6261b51aee48fd..724c389780b4c297482df1539efeee2a2ffb6096 100644 (file)
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.mdoc.in
@@ -2639,7 +2639,7 @@ This can be used to implement support for the
 syntax described earlier.
 The string should consist of the plugin
 path, either fully-qualified or relative to the
-.Pa @prefix@/libexec
+.Pa @PLUGINDIR@
 directory, followed by any configuration arguments the plugin requires.
 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
@@ -3245,7 +3245,7 @@ file.
 #   Debug sudo /var/log/sudo_debug all@warn
 #   Set disable_coredump true
 #
-# The plugin_path is relative to @prefix@/libexec unless
+# The plugin_path is relative to @PLUGINDIR@ unless
 #   fully qualified.
 # The plugin_name corresponds to a global symbol in the plugin
 #   that contains the plugin interface structure.