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

use easprintf() and evasprintf()

Browse Source
This commit is contained in:
Todd C. Miller
1999-07-22 16:23:13 +00:00
parent fd410d4bcb
commit 8d72a57eb9
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
auth/kerb5.c
View File

@@ -101,7 +101,7 @@ kerb5_setup(pw, promptp, data)
/* Only rewrite prompt if user didn't specify their own. */ /* Only rewrite prompt if user didn't specify their own. */
if (!strcmp(prompt, PASSPROMPT)) if (!strcmp(prompt, PASSPROMPT))
asprintf(promptp, "Password for %s@%s: ", pw->pw_name, realm); easprintf(promptp, "Password for %s@%s: ", pw->pw_name, realm);
return(AUTH_SUCCESS); return(AUTH_SUCCESS);
} }

24
logging.c
View File

@@ -167,7 +167,7 @@ do_logfile(msg)
fp = fopen(_PATH_SUDO_LOGFILE, "a"); fp = fopen(_PATH_SUDO_LOGFILE, "a");
(void) umask(oldmask); (void) umask(oldmask);
if (fp == NULL) { if (fp == NULL) {
(void) asprintf(&full_line, "Can't open log file: %s: %s", easprintf(&full_line, "Can't open log file: %s: %s",
_PATH_SUDO_LOGFILE, strerror(errno)); _PATH_SUDO_LOGFILE, strerror(errno));
send_mail(full_line); send_mail(full_line);
free(full_line); free(full_line);
@@ -182,10 +182,10 @@ do_logfile(msg)
# endif # endif
# else # else
# ifdef HOST_IN_LOG # ifdef HOST_IN_LOG
(void) asprintf(&full_line, "%15.15s : %s : HOST=%s : %s", easprintf(&full_line, "%15.15s : %s : HOST=%s : %s",
ctime(&now) + 4, user_name, user_shost, msg); ctime(&now) + 4, user_name, user_shost, msg);
# else # else
(void) asprintf(&full_line, "%15.15s : %s : %s", ctime(&now) + 4, easprintf(&full_line, "%15.15s : %s : %s", ctime(&now) + 4,
user_name, msg); user_name, msg);
# endif # endif
@@ -279,10 +279,10 @@ log_auth(status, inform_user)
} }
if (user_args) if (user_args)
(void) asprintf(&logline, "%sTTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s %s", easprintf(&logline, "%sTTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s %s",
message, user_tty, user_cwd, user_runas, user_cmnd, user_args); message, user_tty, user_cwd, user_runas, user_cmnd, user_args);
else else
(void) asprintf(&logline, "%sTTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s", easprintf(&logline, "%sTTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s",
message, user_tty, user_cwd, user_runas, user_cmnd); message, user_tty, user_cwd, user_runas, user_cmnd);
/* /*
@@ -367,29 +367,29 @@ log_error(va_alist)
#endif #endif
/* Expand printf-style format + args. */ /* Expand printf-style format + args. */
(void) vasprintf(&message, fmt, ap); evasprintf(&message, fmt, ap);
va_end(ap); va_end(ap);
if (flags & MSG_ONLY) if (flags & MSG_ONLY)
logline = message; logline = message;
else if (flags & USE_ERRNO) { else if (flags & USE_ERRNO) {
if (user_args) { if (user_args) {
(void) asprintf(&logline, easprintf(&logline,
"%s: %s ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s %s", "%s: %s ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s %s",
message, strerror(serrno), user_tty, user_cwd, user_runas, message, strerror(serrno), user_tty, user_cwd, user_runas,
user_cmnd, user_args); user_cmnd, user_args);
} else { } else {
(void) asprintf(&logline, easprintf(&logline,
"%s: %s ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s", message, "%s: %s ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s", message,
strerror(serrno), user_tty, user_cwd, user_runas, user_cmnd); strerror(serrno), user_tty, user_cwd, user_runas, user_cmnd);
} }
} else { } else {
if (user_args) { if (user_args) {
(void) asprintf(&logline, easprintf(&logline,
"%s ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s %s", message, "%s ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s %s", message,
user_tty, user_cwd, user_runas, user_cmnd, user_args); user_tty, user_cwd, user_runas, user_cmnd, user_args);
} else { } else {
(void) asprintf(&logline, easprintf(&logline,
"%s ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s", message, "%s ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s", message,
user_tty, user_cwd, user_runas, user_cmnd); user_tty, user_cwd, user_runas, user_cmnd);
} }
@@ -400,8 +400,8 @@ log_error(va_alist)
*/ */
(void) fprintf(stderr, "%s: %s", Argv[0], message); (void) fprintf(stderr, "%s: %s", Argv[0], message);
if (flags & USE_ERRNO) if (flags & USE_ERRNO)
fprintf(stderr, ": %s", strerror(serrno)); (void) fprintf(stderr, ": %s", strerror(serrno));
fputc('\n', stderr); (void) fputc('\n', stderr);
/* /*
* Send a copy of the error via mail. * Send a copy of the error via mail.