diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-06-24 17:57:21 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-06-24 17:57:21 +0000 |
| commit | 9511f026ce5bde5b44128932422174f200fb5b56 (patch) | |
| tree | 15658dd2cccacaf57889cf9a018f7f3bd8f9be0f | |
| parent | 8ddbd5a0bef1497c02ebc98fce2b661ed51124bd (diff) | |
explicit (u_int) for uid and gid
| -rw-r--r-- | usr.bin/ssh/sftp-server.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/sshpty.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c index fe27f39a945..6bd8a2b050b 100644 --- a/usr.bin/ssh/sftp-server.c +++ b/usr.bin/ssh/sftp-server.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: sftp-server.c,v 1.36 2002/06/23 09:30:14 deraadt Exp $"); +RCSID("$OpenBSD: sftp-server.c,v 1.37 2002/06/24 17:57:20 deraadt Exp $"); #include "buffer.h" #include "bufaux.h" @@ -692,13 +692,13 @@ ls_file(char *name, struct stat *st) if ((pw = getpwuid(st->st_uid)) != NULL) { user = pw->pw_name; } else { - snprintf(ubuf, sizeof ubuf, "%u", st->st_uid); + snprintf(ubuf, sizeof ubuf, "%u", (u_int)st->st_uid); user = ubuf; } if ((gr = getgrgid(st->st_gid)) != NULL) { group = gr->gr_name; } else { - snprintf(gbuf, sizeof gbuf, "%u", st->st_gid); + snprintf(gbuf, sizeof gbuf, "%u", (u_int)st->st_gid); group = gbuf; } if (ltime != NULL) { diff --git a/usr.bin/ssh/sshpty.c b/usr.bin/ssh/sshpty.c index 3350764f226..8450f7719a8 100644 --- a/usr.bin/ssh/sshpty.c +++ b/usr.bin/ssh/sshpty.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshpty.c,v 1.6 2002/06/23 21:06:13 deraadt Exp $"); +RCSID("$OpenBSD: sshpty.c,v 1.7 2002/06/24 17:57:20 deraadt Exp $"); #include <util.h> #include "sshpty.h" @@ -276,11 +276,11 @@ pty_setowner(struct passwd *pw, const char *ttyname) if (errno == EROFS && (st.st_uid == pw->pw_uid || st.st_uid == 0)) error("chown(%.100s, %u, %u) failed: %.100s", - ttyname, pw->pw_uid, gid, + ttyname, (u_int)pw->pw_uid, (u_int)gid, strerror(errno)); else fatal("chown(%.100s, %u, %u) failed: %.100s", - ttyname, pw->pw_uid, gid, + ttyname, (u_int)pw->pw_uid, (u_int)gid, strerror(errno)); } } |