Substitute paths set by configure in examples. Bug #1023

3 files changed, 17 insertions, 11 deletions

diff --git a/examples/Makefile.in b/examples/Makefile.in
index a8280cd92..0b58e4233 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -55,7 +55,7 @@ SHELL = @SHELL@
 LOGSRVD_CONF = @LOGSRVD_CONF@
 
 EXAMPLES = $(srcdir)/cvtsudoers.conf $(srcdir)/pam.conf sudo.conf \
-	   $(LOGSRVD_CONF) $(srcdir)/sudoers $(srcdir)/syslog.conf
+	   $(LOGSRVD_CONF) sudoers $(srcdir)/syslog.conf
 
 VERSION = @PACKAGE_VERSION@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -67,9 +67,15 @@ depend:
 Makefile: $(srcdir)/Makefile.in
 	cd $(top_builddir) && ./config.status --file examples/Makefile
 
+sudoers: $(srcdir)/sudoers.in
+	cd $(top_builddir) && ./config.status --file examples/sudoers
+
 sudo.conf: $(srcdir)/sudo.conf.in
 	cd $(top_builddir) && ./config.status --file examples/sudo.conf
 
+sudo_logsrvd.conf: $(srcdir)/sudo_logsrvd.conf.in
+	cd $(top_builddir) && ./config.status --file examples/sudo_logsrvd.conf
+
 pre-install:
 
 install: install-doc
diff --git a/examples/sudo_logsrvd.conf b/examples/sudo_logsrvd.conf.in
index 5fd7d3f40..beb2400a9 100644
--- a/examples/sudo_logsrvd.conf
+++ b/examples/sudo_logsrvd.conf.in
@@ -22,7 +22,7 @@
 #listen_address = *:30344(tls)
 
 # The file containing the ID of the running sudo_logsrvd process.
-#pid_file = /var/run/sudo/sudo_logsrvd.pid
+#pid_file = @rundir@/sudo_logsrvd.pid
 
 # Where to log server warnings: none, stderr, syslog, or a path name.
 #server_log = syslog
@@ -86,8 +86,8 @@
 
 # The directory to store messages in before they are sent to the relay.
 # Messages are stored in wire format.
-# The default value is /var/log/sudo_logsrvd.
-#relay_dir = /var/log/sudo_logsrvd
+# The default value is @relay_dir@.
+#relay_dir = @relay_dir@
 
 # The number of seconds to wait after a connection error before
 # making a new attempt to forward a message to a relay host.
@@ -145,7 +145,7 @@
 [iolog]
 # The top-level directory to use when constructing the path name for the
 # I/O log directory.  The session sequence number, if any, is stored here.
-#iolog_dir = /var/log/sudo-io
+#iolog_dir = @iolog_dir@
 
 # The path name, relative to iolog_dir, in which to store I/O logs.
 # Note that iolog_file may contain directory components.
@@ -223,20 +223,20 @@
 # The following syslog facilities are supported: authpriv (if your OS
 # supports it), auth, daemon, user, local0, local1, local2, local3,
 # local4, local5, local6, and local7.
-#facility = authpriv
+#facility = @logfac@
 
 # Syslog priority to use for event log accept messages, when the command
 # is allowed by the security policy.  The following syslog priorities are
 # supported: alert, crit, debug, emerg, err, info, notice, warning, none.
-#accept_priority = notice
+#accept_priority = @goodpri@
 
 # Syslog priority to use for event log reject messages, when the command
 # is not allowed by the security policy.
-#reject_priority = alert
+#reject_priority = @badpri@
 
 # Syslog priority to use for event log alert messages reported by the
 # client.
-#alert_priority = alert
+#alert_priority = @badpri@
 
 # The syslog facility to use for server warning messages.
 # Defaults to daemon.
@@ -245,7 +245,7 @@
 [logfile]
 # The path to the file-based event log.
 # This path must be fully-qualified and start with a '/' character.
-#path = /var/log/sudo
+#path = @logpath@
 
 # The format string used when formatting the date and time for
 # file-based event logs.  Formatting is performed via strftime(3) so
diff --git a/examples/sudoers b/examples/sudoers.in
index 870ce9167..46953d6fa 100644
--- a/examples/sudoers
+++ b/examples/sudoers.in
@@ -12,7 +12,7 @@ Defaults		syslog=auth,runcwd=~
 Defaults>root		!set_logname
 Defaults:FULLTIMERS	!lecture,runchroot=*
 Defaults:millert	!authenticate
-Defaults@SERVERS	log_year, logfile=/var/log/sudo.log
+Defaults@SERVERS	log_year, logfile=@log_dir@/sudo.log
 Defaults!PAGERS		noexec
 
 ##