diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/sudo_logsrvd.conf.man.in | 4 | ||||
| -rw-r--r-- | doc/sudo_logsrvd.conf.mdoc.in | 4 | ||||
| -rw-r--r-- | examples/sudo_logsrvd.conf | 4 | ||||
| -rw-r--r-- | m4/sudo.m4 | 6 | ||||
| -rw-r--r-- | pathnames.h.in | 2 |
7 files changed, 13 insertions, 13 deletions
@@ -3548,7 +3548,7 @@ printf "%s\n" "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;} iolog_dir=/var/log/sudo-io log_dir=/var/log logpath=/var/log/sudo.log -relay_dir=/var/log/logsrvd-relay +relay_dir=/var/log/sudo_logsrvd rundir=/var/run/sudo vardir=/var/adm/sudo timeout=5 @@ -27889,7 +27889,7 @@ printf %s "checking for sudo_logsrvd relay dir location... " >&6; } # Default value of relay_dir set in configure.ac for d in /var/log /var/adm /usr/adm; do if test -d "$d"; then - relay_dir="$d/logsrvd-relay" + relay_dir="$d/sudo_logsrvd" break fi done diff --git a/configure.ac b/configure.ac index cdf479451..f7f665f8d 100644 --- a/configure.ac +++ b/configure.ac @@ -178,7 +178,7 @@ AC_SUBST([plugindir]) iolog_dir=/var/log/sudo-io log_dir=/var/log logpath=/var/log/sudo.log -relay_dir=/var/log/logsrvd-relay +relay_dir=/var/log/sudo_logsrvd rundir=/var/run/sudo vardir=/var/adm/sudo timeout=5 diff --git a/doc/sudo_logsrvd.conf.man.in b/doc/sudo_logsrvd.conf.man.in index 8993bfab9..ea21f10af 100644 --- a/doc/sudo_logsrvd.conf.man.in +++ b/doc/sudo_logsrvd.conf.man.in @@ -819,8 +819,8 @@ Sudo log server configuration file # 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/logsrvd-relay. -#relay_dir = /var/log/logsrvd-relay +# The default value is /var/log/sudo_logsrvd. +#relay_dir = /var/log/sudo_logsrvd # The number of seconds to wait after a connection error before # making a new attempt to forward a message to a relay host. diff --git a/doc/sudo_logsrvd.conf.mdoc.in b/doc/sudo_logsrvd.conf.mdoc.in index 16bf83d41..b8f1f6911 100644 --- a/doc/sudo_logsrvd.conf.mdoc.in +++ b/doc/sudo_logsrvd.conf.mdoc.in @@ -750,8 +750,8 @@ Sudo log server configuration file # 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/logsrvd-relay. -#relay_dir = /var/log/logsrvd-relay +# The default value is /var/log/sudo_logsrvd. +#relay_dir = /var/log/sudo_logsrvd # The number of seconds to wait after a connection error before # making a new attempt to forward a message to a relay host. diff --git a/examples/sudo_logsrvd.conf b/examples/sudo_logsrvd.conf index 0ce0982b8..e73cd9998 100644 --- a/examples/sudo_logsrvd.conf +++ b/examples/sudo_logsrvd.conf @@ -82,8 +82,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/logsrvd-relay. -#relay_dir = /var/log/logsrvd-relay +# The default value is /var/log/sudo_logsrvd. +#relay_dir = /var/log/sudo_logsrvd # The number of seconds to wait after a connection error before # making a new attempt to forward a message to a relay host. diff --git a/m4/sudo.m4 b/m4/sudo.m4 index 4e5061afe..45c0d3618 100644 --- a/m4/sudo.m4 +++ b/m4/sudo.m4 @@ -155,8 +155,8 @@ SUDO_DEFINE_UNQUOTED(_PATH_SUDO_LECTURE_DIR, "$vardir/lectured") dnl dnl Where the sudo_logsrvd relay temporary log files go, use -dnl /var/log/logsrvd-relay if /var/log exists, else -dnl /{var,usr}/adm/logsrvd-relay +dnl /var/log/sudo_logsrvd if /var/log exists, else +dnl /{var,usr}/adm/sudo_logsrvd dnl AC_DEFUN([SUDO_RELAY_DIR], [ AC_MSG_CHECKING(for sudo_logsrvd relay dir location) @@ -166,7 +166,7 @@ AC_DEFUN([SUDO_RELAY_DIR], [ # Default value of relay_dir set in configure.ac for d in /var/log /var/adm /usr/adm; do if test -d "$d"; then - relay_dir="$d/logsrvd-relay" + relay_dir="$d/sudo_logsrvd" break fi done diff --git a/pathnames.h.in b/pathnames.h.in index b0d3a9939..0115961a5 100644 --- a/pathnames.h.in +++ b/pathnames.h.in @@ -135,7 +135,7 @@ /* * Where to store sudo_logsrvd relay temporary files. Defaults to - * /var/log/logsrvd-relay, /var/adm/logsrvd-relay or /usr/adm/logsrvd-relay + * /var/log/sudo_logsrvd, /var/adm/sudo_logsrvd or /usr/adm/sudo_logsrvd * depending on what exists. */ #ifndef _PATH_SUDO_RELAY_DIR |