diff --git a/aclocal.m4 b/aclocal.m4 index d2fd9c3f8..784f1379f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -12,22 +12,22 @@ dnl AC_DEFUN(SUDO_PROG_SENDMAIL, [AC_MSG_CHECKING(for sendmail) if test -f "/usr/sbin/sendmail"; then 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 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 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 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 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 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 AC_MSG_RESULT(not found) fi diff --git a/configure.in b/configure.in index 32f9ab889..1fb8283cf 100644 --- a/configure.in +++ b/configure.in @@ -647,7 +647,7 @@ AC_ARG_WITH(sendmail, [ --with-sendmail=path set path to sendmail yes) with_sendmail="" ;; no) ;; - *) AC_DEFINE_UNQUOTED(_PATH_SENDMAIL, "$with_sendmail") + *) AC_DEFINE_UNQUOTED(_PATH_SUDO_SENDMAIL, "$with_sendmail") ;; esac]) diff --git a/defaults.c b/defaults.c index cd5102810..95fabd992 100644 --- a/defaults.c +++ b/defaults.c @@ -481,8 +481,8 @@ init_defaults() def_str(I_TIMESTAMPDIR) = estrdup(_PATH_SUDO_TIMEDIR); def_str(I_PASSPROMPT) = estrdup(PASSPROMPT); def_str(I_RUNAS_DEFAULT) = estrdup(RUNAS_DEFAULT); -#ifdef _PATH_SENDMAIL - def_str(I_MAILERPATH) = estrdup(_PATH_SENDMAIL); +#ifdef _PATH_SUDO_SENDMAIL + def_str(I_MAILERPATH) = estrdup(_PATH_SUDO_SENDMAIL); def_str(I_MAILERFLAGS) = estrdup("-t"); #endif #if (LOGGING & SLOG_FILE) diff --git a/pathnames.h.in b/pathnames.h.in index 30e0f71b9..2267534c1 100644 --- a/pathnames.h.in +++ b/pathnames.h.in @@ -86,9 +86,9 @@ #undef _PATH_SUDO_LOGFILE #endif /* _PATH_SUDO_LOGFILE */ -#ifndef _PATH_SENDMAIL -#undef _PATH_SENDMAIL -#endif /* _PATH_SENDMAIL */ +#ifndef _PATH_SUDO_SENDMAIL +#undef _PATH_SUDO_SENDMAIL +#endif /* _PATH_SUDO_SENDMAIL */ #ifndef _PATH_VI #undef _PATH_VI