From: Todd C. Miller Date: Sat, 26 Sep 2009 15:41:14 +0000 (+0000) Subject: Use _PATH_SUDO_TRANSCRIPT instead of _PATH_SUDO_SESSDIR X-Git-Tag: SUDO_1_7_3~263 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d111b0d9bb4883904f6e639614346936a927ec95;p=sudo Use _PATH_SUDO_TRANSCRIPT instead of _PATH_SUDO_SESSDIR --- diff --git a/script.c b/script.c index 13a96d2b1..56be5831d 100644 --- a/script.c +++ b/script.c @@ -121,20 +121,20 @@ script_nextid() char pathbuf[PATH_MAX]; /* - * Create _PATH_SUDO_SESSDIR if it doesn't already exist. + * Create _PATH_SUDO_TRANSCRIPT if it doesn't already exist. */ - if (stat(_PATH_SUDO_SESSDIR, &sb) != 0) { - if (mkdir(_PATH_SUDO_SESSDIR, S_IRWXU) != 0) - log_error(USE_ERRNO, "Can't mkdir %s", _PATH_SUDO_SESSDIR); + if (stat(_PATH_SUDO_TRANSCRIPT, &sb) != 0) { + if (mkdir(_PATH_SUDO_TRANSCRIPT, S_IRWXU) != 0) + log_error(USE_ERRNO, "Can't mkdir %s", _PATH_SUDO_TRANSCRIPT); } else if (!S_ISDIR(sb.st_mode)) { log_error(0, "%s exists but is not a directory (0%o)", - _PATH_SUDO_SESSDIR, (unsigned int) sb.st_mode); + _PATH_SUDO_TRANSCRIPT, (unsigned int) sb.st_mode); } /* * Open sequence file */ - len = snprintf(pathbuf, sizeof(pathbuf), "%s/seq", _PATH_SUDO_SESSDIR); + len = snprintf(pathbuf, sizeof(pathbuf), "%s/seq", _PATH_SUDO_TRANSCRIPT); if (len <= 0 || len >= sizeof(pathbuf)) { errno = ENAMETOOLONG; log_error(USE_ERRNO, "%s/seq", pathbuf); @@ -189,12 +189,12 @@ build_idpath(pathbuf) /* * Path is of the form /var/log/sudo-session/00/00/01. */ - len = snprintf(pathbuf, PATH_MAX, "%s/%c%c/%c%c/%c%c", _PATH_SUDO_SESSDIR, + len = snprintf(pathbuf, PATH_MAX, "%s/%c%c/%c%c/%c%c", _PATH_SUDO_TRANSCRIPT, sudo_user.sessid[0], sudo_user.sessid[1], sudo_user.sessid[2], sudo_user.sessid[3], sudo_user.sessid[4], sudo_user.sessid[5]); if (len <= 0 && len >= PATH_MAX) { errno = ENAMETOOLONG; - log_error(USE_ERRNO, "%s/%s", _PATH_SUDO_SESSDIR, sudo_user.sessid); + log_error(USE_ERRNO, "%s/%s", _PATH_SUDO_TRANSCRIPT, sudo_user.sessid); } /* diff --git a/sudoreplay.c b/sudoreplay.c index 96c4978ab..3a5a0bb12 100644 --- a/sudoreplay.c +++ b/sudoreplay.c @@ -92,7 +92,7 @@ extern int optind; int Argc; char **Argv; -const char *session_dir = _PATH_SUDO_SESSDIR; +const char *session_dir = _PATH_SUDO_TRANSCRIPT; /* * Info present in the transcript log file