From: Todd C. Miller Date: Mon, 11 Mar 1996 07:00:42 +0000 (+0000) Subject: _SUDO_PATH_ -> _CONFIG_PATH_ X-Git-Tag: SUDO_1_5_0~253 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3fc83d9af3889857952100053222aafa97c96c2;p=sudo _SUDO_PATH_ -> _CONFIG_PATH_ --- diff --git a/aclocal.m4 b/aclocal.m4 index f0f1ad52b..932d7ff20 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -9,22 +9,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(_SUDO_PATH_SENDMAIL, "/usr/sbin/sendmail") + AC_DEFINE(_CONFIG_PATH_SENDMAIL, "/usr/sbin/sendmail") elif test -f "/usr/lib/sendmail"; then AC_MSG_RESULT(/usr/lib/sendmail) - AC_DEFINE(_SUDO_PATH_SENDMAIL, "/usr/lib/sendmail") + AC_DEFINE(_CONFIG_PATH_SENDMAIL, "/usr/lib/sendmail") elif test -f "/usr/etc/sendmail"; then AC_MSG_RESULT(/usr/etc/sendmail) - AC_DEFINE(_SUDO_PATH_SENDMAIL, "/usr/etc/sendmail") + AC_DEFINE(_CONFIG_PATH_SENDMAIL, "/usr/etc/sendmail") elif test -f "/usr/ucblib/sendmail"; then AC_MSG_RESULT(/usr/ucblib/sendmail) - AC_DEFINE(_SUDO_PATH_SENDMAIL, "/usr/ucblib/sendmail") + AC_DEFINE(_CONFIG_PATH_SENDMAIL, "/usr/ucblib/sendmail") elif test -f "/usr/local/lib/sendmail"; then AC_MSG_RESULT(/usr/local/lib/sendmail) - AC_DEFINE(_SUDO_PATH_SENDMAIL, "/usr/local/lib/sendmail") + AC_DEFINE(_CONFIG_PATH_SENDMAIL, "/usr/local/lib/sendmail") elif test -f "/usr/local/bin/sendmail"; then AC_MSG_RESULT(/usr/local/bin/sendmail) - AC_DEFINE(_SUDO_PATH_SENDMAIL, "/usr/local/bin/sendmail") + AC_DEFINE(_CONFIG_PATH_SENDMAIL, "/usr/local/bin/sendmail") else AC_MSG_RESULT(not found) fi @@ -36,19 +36,19 @@ dnl AC_DEFUN(SUDO_PROG_VI, [AC_MSG_CHECKING(for vi) if test -f "/usr/bin/vi"; then AC_MSG_RESULT(/usr/bin/vi) - AC_DEFINE(_SUDO_PATH_VI, "/usr/bin/vi") + AC_DEFINE(_CONFIG_PATH_VI, "/usr/bin/vi") elif test -f "/usr/ucb/vi"; then AC_MSG_RESULT(/usr/ucb/vi) - AC_DEFINE(_SUDO_PATH_VI, "/usr/ucb/vi") + AC_DEFINE(_CONFIG_PATH_VI, "/usr/ucb/vi") elif test -f "/usr/bsd/vi"; then AC_MSG_RESULT(/usr/bsd/vi) - AC_DEFINE(_SUDO_PATH_VI, "/usr/bsd/vi") + AC_DEFINE(_CONFIG_PATH_VI, "/usr/bsd/vi") elif test -f "/bin/vi"; then AC_MSG_RESULT(/bin/vi) - AC_DEFINE(_SUDO_PATH_VI, "/bin/vi") + AC_DEFINE(_CONFIG_PATH_VI, "/bin/vi") elif test -f "/usr/local/bin/vi"; then AC_MSG_RESULT(/usr/local/bin/vi) - AC_DEFINE(_SUDO_PATH_VI, "/usr/local/bin/vi") + AC_DEFINE(_CONFIG_PATH_VI, "/usr/local/bin/vi") else AC_MSG_RESULT(not found) fi @@ -60,16 +60,16 @@ dnl AC_DEFUN(SUDO_PROG_PWD, [AC_MSG_CHECKING(for pwd) if test -f "/usr/bin/pwd"; then AC_MSG_RESULT(/usr/bin/pwd) - AC_DEFINE(_SUDO_PATH_PWD, "/usr/bin/pwd") + AC_DEFINE(_CONFIG_PATH_PWD, "/usr/bin/pwd") elif test -f "/bin/pwd"; then AC_MSG_RESULT(/bin/pwd) - AC_DEFINE(_SUDO_PATH_PWD, "/bin/pwd") + AC_DEFINE(_CONFIG_PATH_PWD, "/bin/pwd") elif test -f "/usr/ucb/pwd"; then AC_MSG_RESULT(/usr/ucb/pwd) - AC_DEFINE(_SUDO_PATH_PWD, "/usr/ucb/pwd") + AC_DEFINE(_CONFIG_PATH_PWD, "/usr/ucb/pwd") elif test -f "/usr/sbin/pwd"; then AC_MSG_RESULT(/usr/sbin/pwd) - AC_DEFINE(_SUDO_PATH_PWD, "/usr/sbin/pwd") + AC_DEFINE(_CONFIG_PATH_PWD, "/usr/sbin/pwd") else AC_MSG_RESULT(not found) fi @@ -81,16 +81,16 @@ dnl AC_DEFUN(SUDO_PROG_MV, [AC_MSG_CHECKING(for mv) if test -f "/usr/bin/mv"; then AC_MSG_RESULT(/usr/bin/mv) - AC_DEFINE(_SUDO_PATH_MV, "/usr/bin/mv") + AC_DEFINE(_CONFIG_PATH_MV, "/usr/bin/mv") elif test -f "/bin/mv"; then AC_MSG_RESULT(/bin/mv) - AC_DEFINE(_SUDO_PATH_MV, "/bin/mv") + AC_DEFINE(_CONFIG_PATH_MV, "/bin/mv") elif test -f "/usr/ucb/mv"; then AC_MSG_RESULT(/usr/ucb/mv) - AC_DEFINE(_SUDO_PATH_MV, "/usr/ucb/mv") + AC_DEFINE(_CONFIG_PATH_MV, "/usr/ucb/mv") elif test -f "/usr/sbin/mv"; then AC_MSG_RESULT(/usr/sbin/mv) - AC_DEFINE(_SUDO_PATH_MV, "/usr/sbin/mv") + AC_DEFINE(_CONFIG_PATH_MV, "/usr/sbin/mv") else AC_MSG_RESULT(not found) fi @@ -102,16 +102,16 @@ dnl AC_DEFUN(SUDO_PROG_BSHELL, [AC_MSG_CHECKING(for bourne shell) if test -f "/bin/sh"; then AC_MSG_RESULT(/bin/sh) - AC_DEFINE(_SUDO_PATH_BSHELL, "/bin/sh") + AC_DEFINE(_CONFIG_PATH_BSHELL, "/bin/sh") elif test -f "/usr/bin/sh"; then AC_MSG_RESULT(/usr/bin/sh) - AC_DEFINE(_SUDO_PATH_BSHELL, "/usr/bin/sh") + AC_DEFINE(_CONFIG_PATH_BSHELL, "/usr/bin/sh") elif test -f "/sbin/sh"; then AC_MSG_RESULT(/sbin/sh) - AC_DEFINE(_SUDO_PATH_BSHELL, "/sbin/sh") + AC_DEFINE(_CONFIG_PATH_BSHELL, "/sbin/sh") elif test -f "/sbin/sh"; then AC_MSG_RESULT(/usr/sbin/sh) - AC_DEFINE(_SUDO_PATH_BSHELL, "/usr/sbin/sh") + AC_DEFINE(_CONFIG_PATH_BSHELL, "/usr/sbin/sh") else AC_MSG_RESULT(not found) fi @@ -123,13 +123,13 @@ dnl AC_DEFUN(SUDO_LOGFILE, [AC_MSG_CHECKING(for log file location) if test -d "/var/log"; then AC_MSG_RESULT(/var/log/sudo.log) - AC_DEFINE(_SUDO_PATH_LOGFILE, "/var/log/sudo.log") + AC_DEFINE(_CONFIG_PATH_LOGFILE, "/var/log/sudo.log") elif test -d "/var/adm"; then AC_MSG_RESULT(/var/adm/sudo.log) - AC_DEFINE(_SUDO_PATH_LOGFILE, "/var/adm/sudo.log") + AC_DEFINE(_CONFIG_PATH_LOGFILE, "/var/adm/sudo.log") elif test -d "/usr/adm"; then AC_MSG_RESULT(/usr/adm/sudo.log) - AC_DEFINE(_SUDO_PATH_LOGFILE, "/usr/adm/sudo.log") + AC_DEFINE(_CONFIG_PATH_LOGFILE, "/usr/adm/sudo.log") else AC_MSG_RESULT(unknown, you will have to set _PATH_SUDO_LOGFILE by hand) fi @@ -141,10 +141,10 @@ dnl AC_DEFUN(SUDO_TIMEDIR, [AC_MSG_CHECKING(for timestamp file location) if test -d "/var/run"; then AC_MSG_RESULT(/var/run/sudo) - AC_DEFINE(_SUDO_PATH_TIMEDIR, "/var/run/sudo") + AC_DEFINE(_CONFIG_PATH_TIMEDIR, "/var/run/sudo") elif test -d "/tmp"; then AC_MSG_RESULT(/tmp/.odus) - AC_DEFINE(_SUDO_PATH_TIMEDIR, "/tmp/.odus") + AC_DEFINE(_CONFIG_PATH_TIMEDIR, "/tmp/.odus") else AC_MSG_RESULT(unknown, you will have to set _PATH_SUDO_TIMEDIR by hand) fi diff --git a/config.h.in b/config.h.in index 5e92077ae..f1704cf52 100644 --- a/config.h.in +++ b/config.h.in @@ -252,30 +252,30 @@ * If you want to override these values, do so in pathnames.h, not here! */ -#ifndef _SUDO_PATH_SENDMAIL -#undef _SUDO_PATH_SENDMAIL -#endif /* _SUDO_PATH_SENDMAIL */ +#ifndef _CONFIG_PATH_SENDMAIL +#undef _CONFIG_PATH_SENDMAIL +#endif /* _CONFIG_PATH_SENDMAIL */ -#ifndef _SUDO_PATH_VI -#undef _SUDO_PATH_VI -#endif /* _SUDO_PATH_VI */ +#ifndef _CONFIG_PATH_VI +#undef _CONFIG_PATH_VI +#endif /* _CONFIG_PATH_VI */ -#ifndef _SUDO_PATH_PWD -#undef _SUDO_PATH_PWD -#endif /* _SUDO_PATH_PWD */ +#ifndef _CONFIG_PATH_PWD +#undef _CONFIG_PATH_PWD +#endif /* _CONFIG_PATH_PWD */ -#ifndef _SUDO_PATH_MV -#undef _SUDO_PATH_MV -#endif /* _SUDO_PATH_MV */ +#ifndef _CONFIG_PATH_MV +#undef _CONFIG_PATH_MV +#endif /* _CONFIG_PATH_MV */ -#ifndef _SUDO_PATH_BSHELL -#undef _SUDO_PATH_BSHELL -#endif /* _SUDO_PATH_BSHELL */ +#ifndef _CONFIG_PATH_BSHELL +#undef _CONFIG_PATH_BSHELL +#endif /* _CONFIG_PATH_BSHELL */ -#ifndef _SUDO_PATH_LOGFILE -#undef _SUDO_PATH_LOGFILE -#endif /* _SUDO_PATH_LOGFILE */ +#ifndef _CONFIG_PATH_LOGFILE +#undef _CONFIG_PATH_LOGFILE +#endif /* _CONFIG_PATH_LOGFILE */ -#ifndef _SUDO_PATH_TIMEDIR -#undef _SUDO_PATH_TIMEDIR -#endif /* _SUDO_PATH_TIMEDIR */ +#ifndef _CONFIG_PATH_TIMEDIR +#undef _CONFIG_PATH_TIMEDIR +#endif /* _CONFIG_PATH_TIMEDIR */ diff --git a/pathnames.h.in b/pathnames.h.in index a8a7b1512..76c221c36 100644 --- a/pathnames.h.in +++ b/pathnames.h.in @@ -49,7 +49,7 @@ #endif /* _PATH_SUDO_STMP */ #ifndef _PATH_SUDO_TIMEDIR -#define _PATH_SUDO_TIMEDIR _SUDO_PATH_TIMEDIR +#define _PATH_SUDO_TIMEDIR _CONFIG_PATH_TIMEDIR #endif /* _PATH_SUDO_TIMEDIR */ #ifndef _PATH_TTY @@ -66,25 +66,25 @@ * is /var/log/sudo.log if /var/log exists, else /var/adm/sudo.log */ #ifndef _PATH_SUDO_LOGFILE -#define _PATH_SUDO_LOGFILE _SUDO_PATH_LOGFILE +#define _PATH_SUDO_LOGFILE _CONFIG_PATH_LOGFILE #endif /* _PATH_SUDO_LOGFILE */ #ifndef _PATH_SENDMAIL -#define _PATH_SENDMAIL _SUDO_PATH_SENDMAIL +#define _PATH_SENDMAIL _CONFIG_PATH_SENDMAIL #endif /* _PATH_SENDMAIL */ #ifndef _PATH_VI -#define _PATH_VI _SUDO_PATH_VI +#define _PATH_VI _CONFIG_PATH_VI #endif /* _PATH_VI */ #ifndef _PATH_PWD -#define _PATH_PWD _SUDO_PATH_PWD +#define _PATH_PWD _CONFIG_PATH_PWD #endif /* _PATH_PWD */ #ifndef _PATH_MV -#define _PATH_MV _SUDO_PATH_MV +#define _PATH_MV _CONFIG_PATH_MV #endif /* _PATH_MV */ #ifndef _PATH_BSHELL -#define _PATH_BSHELL _SUDO_PATH_BSHELL +#define _PATH_BSHELL _CONFIG_PATH_BSHELL #endif /* _PATH_BSHELL */