mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

_PATH_SENDMAIL -> _PATH_SUDO_SENDMAIL so --without-sendmail works on

Browse Source 
systems that define  in paths.h
This commit is contained in:
Todd C. Miller 2001-12-14 06:17:35 +00:00
parent e299dee342
commit be8422eedf
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
aclocal.m4 vendored
View File

@ -12,22 +12,22 @@ dnl
AC_DEFUN(SUDO_PROG_SENDMAIL, [AC_MSG_CHECKING(for sendmail) AC_DEFUN(SUDO_PROG_SENDMAIL, [AC_MSG_CHECKING(for sendmail)
if test -f "/usr/sbin/sendmail"; then if test -f "/usr/sbin/sendmail"; then
AC_MSG_RESULT(/usr/sbin/sendmail) AC_MSG_RESULT(/usr/sbin/sendmail)
AC_DEFINE(_PATH_SENDMAIL, "/usr/sbin/sendmail") AC_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/sbin/sendmail")
elif test -f "/usr/lib/sendmail"; then elif test -f "/usr/lib/sendmail"; then
AC_MSG_RESULT(/usr/lib/sendmail) AC_MSG_RESULT(/usr/lib/sendmail)
AC_DEFINE(_PATH_SENDMAIL, "/usr/lib/sendmail") AC_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/lib/sendmail")
elif test -f "/usr/etc/sendmail"; then elif test -f "/usr/etc/sendmail"; then
AC_MSG_RESULT(/usr/etc/sendmail) AC_MSG_RESULT(/usr/etc/sendmail)
AC_DEFINE(_PATH_SENDMAIL, "/usr/etc/sendmail") AC_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/etc/sendmail")
elif test -f "/usr/ucblib/sendmail"; then elif test -f "/usr/ucblib/sendmail"; then
AC_MSG_RESULT(/usr/ucblib/sendmail) AC_MSG_RESULT(/usr/ucblib/sendmail)
AC_DEFINE(_PATH_SENDMAIL, "/usr/ucblib/sendmail") AC_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/ucblib/sendmail")
elif test -f "/usr/local/lib/sendmail"; then elif test -f "/usr/local/lib/sendmail"; then
AC_MSG_RESULT(/usr/local/lib/sendmail) AC_MSG_RESULT(/usr/local/lib/sendmail)
AC_DEFINE(_PATH_SENDMAIL, "/usr/local/lib/sendmail") AC_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/local/lib/sendmail")
elif test -f "/usr/local/bin/sendmail"; then elif test -f "/usr/local/bin/sendmail"; then
AC_MSG_RESULT(/usr/local/bin/sendmail) AC_MSG_RESULT(/usr/local/bin/sendmail)
AC_DEFINE(_PATH_SENDMAIL, "/usr/local/bin/sendmail") AC_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/local/bin/sendmail")
else else
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
fi fi

2
configure.in
View File

@ -647,7 +647,7 @@ AC_ARG_WITH(sendmail, [ --with-sendmail=path set path to sendmail
yes) with_sendmail="" yes) with_sendmail=""
;; ;;
no) ;; no) ;;
*) AC_DEFINE_UNQUOTED(_PATH_SENDMAIL, "$with_sendmail") *) AC_DEFINE_UNQUOTED(_PATH_SUDO_SENDMAIL, "$with_sendmail")
;; ;;
esac]) esac])

4
defaults.c
View File

@ -481,8 +481,8 @@ init_defaults()
def_str(I_TIMESTAMPDIR) = estrdup(_PATH_SUDO_TIMEDIR); def_str(I_TIMESTAMPDIR) = estrdup(_PATH_SUDO_TIMEDIR);
def_str(I_PASSPROMPT) = estrdup(PASSPROMPT); def_str(I_PASSPROMPT) = estrdup(PASSPROMPT);
def_str(I_RUNAS_DEFAULT) = estrdup(RUNAS_DEFAULT); def_str(I_RUNAS_DEFAULT) = estrdup(RUNAS_DEFAULT);
#ifdef _PATH_SENDMAIL #ifdef _PATH_SUDO_SENDMAIL
def_str(I_MAILERPATH) = estrdup(_PATH_SENDMAIL); def_str(I_MAILERPATH) = estrdup(_PATH_SUDO_SENDMAIL);
def_str(I_MAILERFLAGS) = estrdup("-t"); def_str(I_MAILERFLAGS) = estrdup("-t");
#endif #endif
#if (LOGGING & SLOG_FILE) #if (LOGGING & SLOG_FILE)

6
pathnames.h.in
View File

@ -86,9 +86,9 @@
#undef _PATH_SUDO_LOGFILE #undef _PATH_SUDO_LOGFILE
#endif /* _PATH_SUDO_LOGFILE */ #endif /* _PATH_SUDO_LOGFILE */
#ifndef _PATH_SENDMAIL #ifndef _PATH_SUDO_SENDMAIL
#undef _PATH_SENDMAIL #undef _PATH_SUDO_SENDMAIL
#endif /* _PATH_SENDMAIL */ #endif /* _PATH_SUDO_SENDMAIL */
#ifndef _PATH_VI #ifndef _PATH_VI
#undef _PATH_VI #undef _PATH_VI