isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

_PATH_SUDO_SESSDIR -> _PATH_SUDO_TRANSCRIPT

Browse Source 
Add --enable-transcript=DIR option to specify the directory
This commit is contained in:
Todd C. Miller
2009-09-25 20:39:09 +00:00
parent c4fa5baa1c
commit 0e823cdad2
4 changed files with 73 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
aclocal.m4 vendored
View File

@@ -158,28 +158,24 @@ fi
])dnl ])dnl
dnl dnl
dnl Where the session files go, use /var/log/sudo-session if /var/log exists, dnl Where the transcript files go, use /var/log/sudo-transcript if
dnl else /{var,usr}/adm/sudo-session dnl /var/log exists, else /{var,usr}/adm/sudo-transcript
dnl dnl
AC_DEFUN(SUDO_SESSDIR, [AC_MSG_CHECKING(for session file location) if test "$TRANSCRIPT" != "no"; then
if test -n "$with_sessdir"; then AC_DEFUN(SUDO_TRANSCRIPT, [AC_MSG_CHECKING(for transcript dir location)
AC_MSG_RESULT($with_sessdir) if test "$TRANSCRIPT" != "yes"; then
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_SESSDIR, "$with_sessdir") :
sessdir="$with_sessdir" elif test -d "/var/log"; then
elif test -d "/var/log"; then TRANSCRIPT="/var/log/sudo-transcript"
AC_MSG_RESULT(/var/log/sudo-session) elif test -d "/var/adm"; then
SUDO_DEFINE(_PATH_SUDO_SESSDIR, "/var/log/sudo-session") TRANSCRIPT="/var/adm/sudo-transcript"
sessdir="/var/log/sudo-session" else
elif test -d "/var/adm"; then TRANSCRIPT="/usr/adm/sudo-transcript"
AC_MSG_RESULT(/var/adm/sudo-session) fi
SUDO_DEFINE(_PATH_SUDO_SESSDIR, "/var/adm/sudo-session") AC_MSG_RESULT($TRANSCRIPT)
sessdir="/var/adm/sudo-session" SUDO_DEFINE_UNQUOTED(_PATH_SUDO_TRANSCRIPT, "$TRANSCRIPT")
else ])dnl
AC_MSG_RESULT(/usr/adm/sudo-session)
SUDO_DEFINE(_PATH_SUDO_SESSDIR, "/usr/adm/sudo-session")
sessdir="/usr/adm/sudo-session"
fi fi
])dnl
dnl dnl
dnl SUDO_CHECK_TYPE(TYPE, DEFAULT) dnl SUDO_CHECK_TYPE(TYPE, DEFAULT)

81
configure vendored
View File

@@ -1502,6 +1502,8 @@ Optional Features:
Set $HOME to target user in shell mode Set $HOME to target user in shell mode
--disable-path-info Print 'command not allowed' not 'command not found' --disable-path-info Print 'command not allowed' not 'command not found'
--enable-env-debug Whether to enable environment debugging. --enable-env-debug Whether to enable environment debugging.
--enable-transcript=DIR Enable Sudo's transcript support, storing them in
DIR
--enable-gss-krb5-ccache-name --enable-gss-krb5-ccache-name
Use GSS-API to set the Kerberos V cred cache name Use GSS-API to set the Kerberos V cred cache name
--enable-static[=PKGS] build static libraries [default=no] --enable-static[=PKGS] build static libraries [default=no]
@@ -2170,6 +2172,7 @@ AUTH_EXCL=
AUTH_EXCL_DEF= AUTH_EXCL_DEF=
AUTH_DEF=passwd AUTH_DEF=passwd
TRANSCRIPT=yes
CHECKSHADOW=true CHECKSHADOW=true
shadow_defs= shadow_defs=
shadow_funcs= shadow_funcs=
@@ -4114,6 +4117,20 @@ echo "${ECHO_T}no" >&6; }
fi fi
# Check whether --enable-transcript was given.
if test "${enable_transcript+set}" = set; then
enableval=$enable_transcript; case "$enableval" in
yes) TRANSCRIPT=yes
;;
no) TRANSCRIPT=no
;;
*) TRANSCRIPT="$enableval"
;;
esac
fi
# Check whether --with-selinux was given. # Check whether --with-selinux was given.
if test "${with_selinux+set}" = set; then if test "${with_selinux+set}" = set; then
@@ -6268,7 +6285,7 @@ ia64-*-hpux*)
;; ;;
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 6271 "configure"' > conftest.$ac_ext echo '#line 6288 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
@@ -8132,11 +8149,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8135: $lt_compile\"" >&5) (eval echo "\"\$as_me:8152: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:8139: \$? = $ac_status" >&5 echo "$as_me:8156: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output. # So say no if there are warnings other than the usual output.
@@ -8422,11 +8439,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8425: $lt_compile\"" >&5) (eval echo "\"\$as_me:8442: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:8429: \$? = $ac_status" >&5 echo "$as_me:8446: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output. # So say no if there are warnings other than the usual output.
@@ -8526,11 +8543,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8529: $lt_compile\"" >&5) (eval echo "\"\$as_me:8546: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:8533: \$? = $ac_status" >&5 echo "$as_me:8550: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@@ -10886,7 +10903,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10889 "configure" #line 10906 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@@ -10986,7 +11003,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10989 "configure" #line 11006 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@@ -25122,41 +25139,23 @@ EOF
timedir="/usr/adm/sudo" timedir="/usr/adm/sudo"
fi fi
{ echo "$as_me:$LINENO: checking for session file location" >&5 { echo "$as_me:$LINENO: checking for transcript dir location" >&5
echo $ECHO_N "checking for session file location... $ECHO_C" >&6; } echo $ECHO_N "checking for transcript dir location... $ECHO_C" >&6; }
if test -n "$with_sessdir"; then if test "$TRANSCRIPT" != "yes"; then
{ echo "$as_me:$LINENO: result: $with_sessdir" >&5 :
echo "${ECHO_T}$with_sessdir" >&6; } elif test -d "/var/log"; then
TRANSCRIPT="/var/log/sudo-transcript"
elif test -d "/var/adm"; then
TRANSCRIPT="/var/adm/sudo-transcript"
else
TRANSCRIPT="/usr/adm/sudo-transcript"
fi
{ echo "$as_me:$LINENO: result: $TRANSCRIPT" >&5
echo "${ECHO_T}$TRANSCRIPT" >&6; }
cat >>confdefs.h <<EOF cat >>confdefs.h <<EOF
#define _PATH_SUDO_SESSDIR "$with_sessdir" #define _PATH_SUDO_TRANSCRIPT "$TRANSCRIPT"
EOF EOF
sessdir="$with_sessdir"
elif test -d "/var/log"; then
{ echo "$as_me:$LINENO: result: /var/log/sudo-session" >&5
echo "${ECHO_T}/var/log/sudo-session" >&6; }
cat >>confdefs.h <<\EOF
#define _PATH_SUDO_SESSDIR "/var/log/sudo-session"
EOF
sessdir="/var/log/sudo-session"
elif test -d "/var/adm"; then
{ echo "$as_me:$LINENO: result: /var/adm/sudo-session" >&5
echo "${ECHO_T}/var/adm/sudo-session" >&6; }
cat >>confdefs.h <<\EOF
#define _PATH_SUDO_SESSDIR "/var/adm/sudo-session"
EOF
sessdir="/var/adm/sudo-session"
else
{ echo "$as_me:$LINENO: result: /usr/adm/sudo-session" >&5
echo "${ECHO_T}/usr/adm/sudo-session" >&6; }
cat >>confdefs.h <<\EOF
#define _PATH_SUDO_SESSDIR "/usr/adm/sudo-session"
EOF
sessdir="/usr/adm/sudo-session"
fi
case "$with_passwd" in case "$with_passwd" in

15
configure.in
View File

@@ -142,6 +142,7 @@ AUTH_DEF=passwd
dnl dnl
dnl Other vaiables dnl Other vaiables
dnl dnl
TRANSCRIPT=yes
CHECKSHADOW=true CHECKSHADOW=true
shadow_defs= shadow_defs=
shadow_funcs= shadow_funcs=
@@ -1218,6 +1219,18 @@ AC_ARG_ENABLE(env_debug,
esac esac
], AC_MSG_RESULT(no)) ], AC_MSG_RESULT(no))
AC_ARG_ENABLE(transcript,
[AS_HELP_STRING([--enable-transcript[[=DIR]]], [Enable Sudo's transcript support, storing them in DIR])],
[ case "$enableval" in
yes) TRANSCRIPT=yes
;;
no) TRANSCRIPT=no
;;
*) TRANSCRIPT="$enableval"
;;
esac
])
AC_ARG_WITH(selinux, [AS_HELP_STRING([--with-selinux], [enable SELinux support])], AC_ARG_WITH(selinux, [AS_HELP_STRING([--with-selinux], [enable SELinux support])],
[case $with_selinux in [case $with_selinux in
yes) SELINUX_USAGE="[[-r role]] [[-t type]] " yes) SELINUX_USAGE="[[-r role]] [[-t type]] "
@@ -2570,7 +2583,7 @@ dnl Check for log file and timestamp locations
dnl dnl
SUDO_LOGFILE SUDO_LOGFILE
SUDO_TIMEDIR SUDO_TIMEDIR
SUDO_SESSDIR SUDO_TRANSCRIPT
dnl dnl
dnl Use passwd (and secureware) auth modules? dnl Use passwd (and secureware) auth modules?

6
pathnames.h.in
View File

@@ -72,9 +72,9 @@
* Where to put the session files. Defaults to /var/log/sudo-session, * Where to put the session files. Defaults to /var/log/sudo-session,
* /var/adm/sudo-session or /usr/adm/sudo-session depending on what exists. * /var/adm/sudo-session or /usr/adm/sudo-session depending on what exists.
*/ */
#ifndef _PATH_SUDO_SESSDIR #ifndef _PATH_SUDO_TRANSCRIPT
#undef _PATH_SUDO_SESSDIR #undef _PATH_SUDO_TRANSCRIPT
#endif /* _PATH_SUDO_SESSDIR */ #endif /* _PATH_SUDO_TRANSCRIPT */
/* /*
* Where to put the sudo log file when logging to a file. Defaults to * Where to put the sudo log file when logging to a file. Defaults to