diff options
Diffstat (limited to 'usr.bin/rsync/ids.c')
| -rw-r--r-- | usr.bin/rsync/ids.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/usr.bin/rsync/ids.c b/usr.bin/rsync/ids.c index 4ef97186a58..f4c77f5f22d 100644 --- a/usr.bin/rsync/ids.c +++ b/usr.bin/rsync/ids.c @@ -1,4 +1,4 @@ -/* $Id: ids.c,v 1.8 2019/02/21 22:13:43 benno Exp $ */ +/* $Id: ids.c,v 1.9 2019/03/23 16:04:28 deraadt Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -133,8 +133,8 @@ idents_remap(struct sess *sess, int isgid, struct ident *ids, size_t idsz) else ids[i].mapped = id; - LOG4(sess, "remapped identifier %s: %" PRId32 " -> %" PRId32, - ids[i].name, ids[i].id, ids[i].mapped); + LOG4(sess, "remapped identifier %s: %d -> %d", + ids[i].name, ids[i].id, ids[i].mapped); } } @@ -171,23 +171,23 @@ idents_add(struct sess *sess, int isgid, assert(i == *idsz); if (isgid) { if ((grp = getgrgid((gid_t)id)) == NULL) { - ERR(sess, "%" PRId32 ": unknown gid", id); + ERR(sess, "%d: unknown gid", id); return 0; } name = grp->gr_name; } else { if ((usr = getpwuid((uid_t)id)) == NULL) { - ERR(sess, "%" PRId32 ": unknown uid", id); + ERR(sess, "%d: unknown uid", id); return 0; } name = usr->pw_name; } if ((sz = strlen(name)) > UINT8_MAX) { - ERRX(sess, "%" PRId32 ": name too long: %s", id, name); + ERRX(sess, "%d: name too long: %s", id, name); return 0; } else if (sz == 0) { - ERRX(sess, "%" PRId32 ": zero-length name", id); + ERRX(sess, "%d: zero-length name", id); return 0; } @@ -207,7 +207,7 @@ idents_add(struct sess *sess, int isgid, } LOG4(sess, "adding identifier to list: %s (%u)", - (*ids)[*idsz].name, (*ids)[*idsz].id); + (*ids)[*idsz].name, (*ids)[*idsz].id); (*idsz)++; return 1; } @@ -289,8 +289,7 @@ idents_recv(struct sess *sess, ERRX1(sess, "io_read_byte"); return 0; } else if (sz == 0) - WARNX(sess, "zero-length name " - "in identifier list"); + WARNX(sess, "zero-length name in identifier list"); (*ids)[*idsz].id = id; (*ids)[*idsz].name = calloc(sz + 1, 1); |