mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-29 13:28:10 +00:00
Code Issues Releases Wiki Activity

Install the example sudo_logsrvd.conf unless one already exists

Browse Source
This commit is contained in:
Todd C. Miller 2020-04-08 08:54:27 -06:00
parent 700becabc0
commit 55eb0a633c
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -737,6 +737,7 @@ logpath
log_dir log_dir
iolog_dir iolog_dir
PPFILES PPFILES
LOGSRVD_CONF
LOGSRVD LOGSRVD
LIBLOGSRV LIBLOGSRV
LOGSRV LOGSRV
@ -3123,6 +3124,7 @@ $as_echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;}
# #
@ -3173,7 +3175,6 @@ 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"
PPFILES='$(srcdir)/etc/sudo.pp'
# #
# End initial values for man page substitution # End initial values for man page substitution
# #
@ -3222,8 +3223,10 @@ shadow_libs=
TMPFILES_D= TMPFILES_D=
CONFIGURE_ARGS="$@" CONFIGURE_ARGS="$@"
LOGSRVD=logsrvd LOGSRVD=logsrvd
LOGSRVD_CONF='$(srcdir)/sudo_logsrvd.conf'
LOGSRV=lib/logsrv LOGSRV=lib/logsrv
LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la' LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la'
PPFILES='$(srcdir)/etc/sudo.pp'
RTLD_PRELOAD_VAR="LD_PRELOAD" RTLD_PRELOAD_VAR="LD_PRELOAD"
RTLD_PRELOAD_ENABLE_VAR= RTLD_PRELOAD_ENABLE_VAR=
@ -6945,6 +6948,7 @@ if test "${enable_log_server+set}" = set; then :
;; ;;
no) no)
LOGSRVD= LOGSRVD=
LOGSRVD_CONF=
;; ;;
*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring unknown argument to --enable-log-server: $enableval" >&5 *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring unknown argument to --enable-log-server: $enableval" >&5
$as_echo "$as_me: WARNING: Ignoring unknown argument to --enable-log-server: $enableval" >&2;} $as_echo "$as_me: WARNING: Ignoring unknown argument to --enable-log-server: $enableval" >&2;}

5
configure.ac
View File

@ -119,6 +119,7 @@ AC_SUBST([PYTHON_PLUGIN_SRC])
AC_SUBST([LOGSRV]) AC_SUBST([LOGSRV])
AC_SUBST([LIBLOGSRV]) AC_SUBST([LIBLOGSRV])
AC_SUBST([LOGSRVD]) AC_SUBST([LOGSRVD])
AC_SUBST([LOGSRVD_CONF])
AC_SUBST([PPFILES]) AC_SUBST([PPFILES])
dnl dnl
@ -214,7 +215,6 @@ 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"
PPFILES='$(srcdir)/etc/sudo.pp'
# #
# End initial values for man page substitution # End initial values for man page substitution
# #
@ -270,8 +270,10 @@ shadow_libs=
TMPFILES_D= TMPFILES_D=
CONFIGURE_ARGS="$@" CONFIGURE_ARGS="$@"
LOGSRVD=logsrvd LOGSRVD=logsrvd
LOGSRVD_CONF='$(srcdir)/sudo_logsrvd.conf'
LOGSRV=lib/logsrv LOGSRV=lib/logsrv
LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la' LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la'
PPFILES='$(srcdir)/etc/sudo.pp'
dnl dnl
dnl LD_PRELOAD equivalents dnl LD_PRELOAD equivalents
@ -1659,6 +1661,7 @@ AC_ARG_ENABLE(log-server,
;; ;;
no) no)
LOGSRVD= LOGSRVD=
LOGSRVD_CONF=
;; ;;
*) AC_MSG_WARN([Ignoring unknown argument to --enable-log-server: $enableval]) *) AC_MSG_WARN([Ignoring unknown argument to --enable-log-server: $enableval])
;; ;;

7
examples/Makefile.in
View File

@ -52,7 +52,9 @@ install_gid = 0
SHELL = @SHELL@ SHELL = @SHELL@
EXAMPLES = $(srcdir)/pam.conf sudo.conf $(srcdir)/sudo_logsrvd.conf \ LOGSRVD_CONF = @LOGSRVD_CONF@
EXAMPLES = $(srcdir)/pam.conf sudo.conf $(LOGSRVD_CONF) \
$(srcdir)/sudoers $(srcdir)/syslog.conf $(srcdir)/sudoers $(srcdir)/syslog.conf
VERSION = @PACKAGE_VERSION@ VERSION = @PACKAGE_VERSION@
@ -83,6 +85,9 @@ install-doc: install-dirs
for f in $(EXAMPLES); do $(INSTALL) $(INSTALL_OWNER) -m 0644 $$f $(DESTDIR)$(exampledir); done for f in $(EXAMPLES); do $(INSTALL) $(INSTALL_OWNER) -m 0644 $$f $(DESTDIR)$(exampledir); done
test -r $(DESTDIR)$(sysconfdir)/sudo.conf || \ test -r $(DESTDIR)$(sysconfdir)/sudo.conf || \
$(INSTALL) $(INSTALL_OWNER) -m 0644 sudo.conf $(DESTDIR)$(sysconfdir) $(INSTALL) $(INSTALL_OWNER) -m 0644 sudo.conf $(DESTDIR)$(sysconfdir)
if test -n "$(LOGSRVD_CONF)" -a ! -r $(DESTDIR)$(sysconfdir)/sudo_logsrvd.conf; then \
$(INSTALL) $(INSTALL_OWNER) -m 0644 $(LOGSRVD_CONF) $(DESTDIR)$(sysconfdir); \
fi
install-plugin: install-plugin: