mirror of
https://github.com/sudo-project/sudo.git
synced 2025-08-22 01:49:11 +00:00
Substitute values in the example syslog.conf too.
Also update ignore files for example changes
This commit is contained in:
Todd C. Miller
parent
0bbe4b1813
commit
63b2a62f8a
3
.gitignore
vendored
3
.gitignore
vendored
@ -31,6 +31,9 @@ docs/*.mdoc
|
||||
docs/fixman.sed
|
||||
|
||||
examples/sudo.conf
|
||||
examples/sudo_logsrvd.conf
|
||||
examples/sudoers
|
||||
examples/syslog.conf
|
||||
|
||||
etc/init.d/sudo.conf
|
||||
|
||||
|
||||
@ -29,6 +29,9 @@ Makefile$
|
||||
^etc/init\.d/sudo\.conf$
|
||||
|
||||
^examples/sudo\.conf$
|
||||
^examples/sudo_logsrvd\.conf$
|
||||
^examples/sudoers$
|
||||
^examples/syslog\.conf$
|
||||
|
||||
^init\.d/.*\.sh$
|
||||
^init\.d/sudo\.conf$
|
||||
|
||||
2
MANIFEST
2
MANIFEST
@ -81,7 +81,7 @@ examples/pam.conf
|
||||
examples/sudo.conf.in
|
||||
examples/sudo_logsrvd.conf.in
|
||||
examples/sudoers.in
|
||||
examples/syslog.conf
|
||||
examples/syslog.conf.in
|
||||
include/Makefile.in
|
||||
include/compat/charclass.h
|
||||
include/compat/endian.h
|
||||
|
||||
3
configure
vendored
3
configure
vendored
@ -32257,7 +32257,7 @@ elif test X"$TMPFILES_D" != X""; then
|
||||
|
||||
fi
|
||||
|
||||
ac_config_files="$ac_config_files Makefile docs/Makefile examples/Makefile examples/sudoers examples/sudo.conf examples/sudo_logsrvd.conf include/Makefile lib/eventlog/Makefile lib/fuzzstub/Makefile lib/iolog/Makefile lib/logsrv/Makefile lib/protobuf-c/Makefile lib/util/Makefile lib/util/util.exp logsrvd/Makefile src/intercept.exp src/sudo_usage.h src/Makefile plugins/audit_json/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/sample_approval/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers"
|
||||
ac_config_files="$ac_config_files Makefile docs/Makefile examples/Makefile examples/sudoers examples/sudo.conf examples/sudo_logsrvd.conf examples/syslog.conf include/Makefile lib/eventlog/Makefile lib/fuzzstub/Makefile lib/iolog/Makefile lib/logsrv/Makefile lib/protobuf-c/Makefile lib/util/Makefile lib/util/util.exp logsrvd/Makefile src/intercept.exp src/sudo_usage.h src/Makefile plugins/audit_json/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/sample_approval/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers"
|
||||
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
@ -33254,6 +33254,7 @@ do
|
||||
"examples/sudoers") CONFIG_FILES="$CONFIG_FILES examples/sudoers" ;;
|
||||
"examples/sudo.conf") CONFIG_FILES="$CONFIG_FILES examples/sudo.conf" ;;
|
||||
"examples/sudo_logsrvd.conf") CONFIG_FILES="$CONFIG_FILES examples/sudo_logsrvd.conf" ;;
|
||||
"examples/syslog.conf") CONFIG_FILES="$CONFIG_FILES examples/syslog.conf" ;;
|
||||
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
|
||||
"lib/eventlog/Makefile") CONFIG_FILES="$CONFIG_FILES lib/eventlog/Makefile" ;;
|
||||
"lib/fuzzstub/Makefile") CONFIG_FILES="$CONFIG_FILES lib/fuzzstub/Makefile" ;;
|
||||
|
||||
@ -5114,7 +5114,7 @@ elif test X"$TMPFILES_D" != X""; then
|
||||
AC_CONFIG_FILES([etc/init.d/sudo.conf])
|
||||
fi
|
||||
|
||||
AC_CONFIG_FILES([Makefile docs/Makefile examples/Makefile examples/sudoers examples/sudo.conf examples/sudo_logsrvd.conf include/Makefile lib/eventlog/Makefile lib/fuzzstub/Makefile lib/iolog/Makefile lib/logsrv/Makefile lib/protobuf-c/Makefile lib/util/Makefile lib/util/util.exp logsrvd/Makefile src/intercept.exp src/sudo_usage.h src/Makefile plugins/audit_json/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/sample_approval/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers])
|
||||
AC_CONFIG_FILES([Makefile docs/Makefile examples/Makefile examples/sudoers examples/sudo.conf examples/sudo_logsrvd.conf examples/syslog.conf include/Makefile lib/eventlog/Makefile lib/fuzzstub/Makefile lib/iolog/Makefile lib/logsrv/Makefile lib/protobuf-c/Makefile lib/util/Makefile lib/util/util.exp logsrvd/Makefile src/intercept.exp src/sudo_usage.h src/Makefile plugins/audit_json/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/sample_approval/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers])
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# SPDX-License-Identifier: ISC
|
||||
#
|
||||
# Copyright (c) 2014, 2017-2021 Todd C. Miller <Todd.Miller@sudo.ws>
|
||||
# Copyright (c) 2014, 2017-2022 Todd C. Miller <Todd.Miller@sudo.ws>
|
||||
#
|
||||
# Permission to use, copy, modify, and distribute this software for any
|
||||
# purpose with or without fee is hereby granted, provided that the above
|
||||
@ -55,7 +55,7 @@ SHELL = @SHELL@
|
||||
LOGSRVD_CONF = @LOGSRVD_CONF@
|
||||
|
||||
EXAMPLES = $(srcdir)/cvtsudoers.conf $(srcdir)/pam.conf sudo.conf \
|
||||
$(LOGSRVD_CONF) sudoers $(srcdir)/syslog.conf
|
||||
$(LOGSRVD_CONF) sudoers syslog.conf
|
||||
|
||||
VERSION = @PACKAGE_VERSION@
|
||||
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
@ -76,6 +76,9 @@ sudo.conf: $(srcdir)/sudo.conf.in
|
||||
sudo_logsrvd.conf: $(srcdir)/sudo_logsrvd.conf.in
|
||||
cd $(top_builddir) && ./config.status --file examples/sudo_logsrvd.conf
|
||||
|
||||
syslog.conf: $(srcdir)/syslog.conf.in
|
||||
cd $(top_builddir) && ./config.status --file examples/syslog.conf
|
||||
|
||||
pre-install:
|
||||
|
||||
install: install-doc
|
||||
@ -121,7 +124,7 @@ clean:
|
||||
mostlyclean: clean
|
||||
|
||||
distclean: clean
|
||||
-rm -rf Makefile sudo.conf
|
||||
-rm -rf Makefile sudo.conf sudo_logsrvd.conf sudoers syslog.conf
|
||||
|
||||
clobber: distclean
|
||||
|
||||
|
||||
@ -135,5 +135,5 @@
|
||||
# Priority may be crit, err, warn, notice, diag, info, trace, or debug.
|
||||
# Multiple subsystem@priority may be specified, separated by a comma.
|
||||
#
|
||||
#Debug sudo /var/log/sudo_debug all@debug
|
||||
#Debug sudoers.so /var/log/sudoers_debug all@debug
|
||||
#Debug sudo @log_dir@/sudo_debug all@debug
|
||||
#Debug sudoers.so @log_dir@/sudoers_debug all@debug
|
||||
|
||||
@ -14,11 +14,11 @@
|
||||
#
|
||||
# Syslogd will not create new log files for you, you must first
|
||||
# create the file before syslogd will log to it. Eg.
|
||||
# 'touch /var/log/sudo'
|
||||
# 'touch @log_dir@/sudo'
|
||||
|
||||
# This logs successful and failed sudo attempts to the file /var/log/auth
|
||||
# This logs successful and failed sudo attempts to the file @log_dir@/auth
|
||||
# If your system has the authpriv syslog facility, use authpriv.debug
|
||||
auth.debug /var/log/auth
|
||||
auth.debug @log_dir@/auth
|
||||
|
||||
# To log to a remote machine, use something like the following,
|
||||
# where "loghost" is the name of the remote machine.
|
||||
Loading…
x
Reference in New Issue
Block a user