mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-23 09:17:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cast *ID types to unsigned long when printing.

Browse Source 
UID and GID types vary by platform so cast to u_long and use %lu when
printing them to prevent warnings.
This commit is contained in:
Darren Tucker 2019-07-06 13:02:34 +10:00
parent 2753521e89
commit 4c3e00b1ed
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openbsd-compat/bsd-setres_id.c
View File

@ -37,20 +37,20 @@ setresgid(gid_t rgid, gid_t egid, gid_t sgid)
#if defined(HAVE_SETREGID) && !defined(BROKEN_SETREGID)
if (setregid(rgid, egid) < 0) {
saved_errno = errno;
error("setregid %u: %.100s", rgid, strerror(errno));
error("setregid %lu: %.100s", (u_long)rgid, strerror(errno));
errno = saved_errno;
ret = -1;
}
#else
if (setegid(egid) < 0) {
saved_errno = errno;
error("setegid %u: %.100s", (u_int)egid, strerror(errno));
error("setegid %lu: %.100s", (u_long)egid, strerror(errno));
errno = saved_errno;
ret = -1;
}
if (setgid(rgid) < 0) {
saved_errno = errno;
error("setgid %u: %.100s", rgid, strerror(errno));
error("setgid %ul: %.100s", (u_long)rgid, strerror(errno));
errno = saved_errno;
ret = -1;
}
@ -72,7 +72,7 @@ setresuid(uid_t ruid, uid_t euid, uid_t suid)
#if defined(HAVE_SETREUID) && !defined(BROKEN_SETREUID)
if (setreuid(ruid, euid) < 0) {
saved_errno = errno;
error("setreuid %u: %.100s", ruid, strerror(errno));
error("setreuid %lu: %.100s", (u_long)ruid, strerror(errno));
errno = saved_errno;
ret = -1;
}
@ -81,14 +81,14 @@ setresuid(uid_t ruid, uid_t euid, uid_t suid)
# ifndef SETEUID_BREAKS_SETUID
if (seteuid(euid) < 0) {
saved_errno = errno;
error("seteuid %u: %.100s", euid, strerror(errno));
error("seteuid %lu: %.100s", (u_long)euid, strerror(errno));
errno = saved_errno;
ret = -1;
}
# endif
if (setuid(ruid) < 0) {
saved_errno = errno;
error("setuid %u: %.100s", ruid, strerror(errno));
error("setuid %lu: %.100s", (u_long)ruid, strerror(errno));
errno = saved_errno;
ret = -1;
}

4
openbsd-compat/pwcache.c
View File

@ -67,7 +67,7 @@ user_from_uid(uid_t uid, int nouser)
if ((pw = getpwuid(uid)) == NULL) {
if (nouser)
return (NULL);
(void)snprintf(nbuf, sizeof(nbuf), "%u", uid);
(void)snprintf(nbuf, sizeof(nbuf), "%lu", (u_long)uid);
}
cp->uid = uid;
if (cp->name != NULL)
@ -102,7 +102,7 @@ group_from_gid(gid_t gid, int nogroup)
if ((gr = getgrgid(gid)) == NULL) {
if (nogroup)
return (NULL);
(void)snprintf(nbuf, sizeof(nbuf), "%u", gid);
(void)snprintf(nbuf, sizeof(nbuf), "%lu", (u_long)gid);
}
cp->gid = gid;
if (cp->name != NULL)