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

Fix some printf format mismatches on error.

Browse Source
This commit is contained in:
Todd C. Miller
2005-02-12 23:46:13 +00:00
parent 889a0334e6
commit cc84c41fbe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
check.c
View File

@@ -311,7 +311,7 @@ build_timestamp(timestampdir, timestampfile)
dirparent = def_timestampdir; dirparent = def_timestampdir;
len = easprintf(timestampdir, "%s/%s", dirparent, user_name); len = easprintf(timestampdir, "%s/%s", dirparent, user_name);
if (len >= PATH_MAX) if (len >= PATH_MAX)
log_error(0, "timestamp path too long: %s", timestampdir); log_error(0, "timestamp path too long: %s", *timestampdir);
/* /*
* Timestamp file may be a file in the directory or NUL to use * Timestamp file may be a file in the directory or NUL to use
@@ -330,12 +330,12 @@ build_timestamp(timestampdir, timestampfile)
else else
len = easprintf(timestampfile, "%s/%s/%s", dirparent, user_name, p); len = easprintf(timestampfile, "%s/%s/%s", dirparent, user_name, p);
if (len >= PATH_MAX) if (len >= PATH_MAX)
log_error(0, "timestamp path too long: %s", timestampfile); log_error(0, "timestamp path too long: %s", *timestampfile);
} else if (def_targetpw) { } else if (def_targetpw) {
len = easprintf(timestampfile, "%s/%s/%s", dirparent, user_name, len = easprintf(timestampfile, "%s/%s/%s", dirparent, user_name,
*user_runas); *user_runas);
if (len >= PATH_MAX) if (len >= PATH_MAX)
log_error(0, "timestamp path too long: %s", timestampfile); log_error(0, "timestamp path too long: %s", *timestampfile);
} else } else
*timestampfile = NULL; *timestampfile = NULL;
} }
@@ -460,7 +460,7 @@ timestamp_status(timestampdir, timestampfile, user, make_dirs)
/* If bad uid or file mode, complain and kill the bogus file. */ /* If bad uid or file mode, complain and kill the bogus file. */
if (sb.st_uid != timestamp_uid) { if (sb.st_uid != timestamp_uid) {
log_error(NO_EXIT, log_error(NO_EXIT,
"%s owned by uid %ud, should be uid %lu", "%s owned by uid %lu, should be uid %lu",
timestampfile, (unsigned long) sb.st_uid, timestampfile, (unsigned long) sb.st_uid,
(unsigned long) timestamp_uid); (unsigned long) timestamp_uid);
(void) unlink(timestampfile); (void) unlink(timestampfile);