===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/ids.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/rsync/ids.c	2019/03/31 09:26:05	1.11
--- src/usr.bin/rsync/ids.c	2019/05/08 20:00:25	1.12
***************
*** 1,4 ****
! /*	$Id: ids.c,v 1.11 2019/03/31 09:26:05 deraadt Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: ids.c,v 1.12 2019/05/08 20:00:25 benno Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 142,148 ****
  		else
  			ids[i].mapped = id;
  
! 		LOG4(sess, "remapped identifier %s: %d -> %d",
  		    ids[i].name, ids[i].id, ids[i].mapped);
  	}
  }
--- 142,148 ----
  		else
  			ids[i].mapped = id;
  
! 		LOG4("remapped identifier %s: %d -> %d",
  		    ids[i].name, ids[i].id, ids[i].mapped);
  	}
  }
***************
*** 180,202 ****
  	assert(i == *idsz);
  	if (isgid) {
  		if ((grp = getgrgid((gid_t)id)) == NULL) {
! 			ERR(sess, "%d: unknown gid", id);
  			return 0;
  		}
  		name = grp->gr_name;
  	} else {
  		if ((usr = getpwuid((uid_t)id)) == NULL) {
! 			ERR(sess, "%d: unknown uid", id);
  			return 0;
  		}
  		name = usr->pw_name;
  	}
  
  	if ((sz = strlen(name)) > UINT8_MAX) {
! 		ERRX(sess, "%d: name too long: %s", id, name);
  		return 0;
  	} else if (sz == 0) {
! 		ERRX(sess, "%d: zero-length name", id);
  		return 0;
  	}
  
--- 180,202 ----
  	assert(i == *idsz);
  	if (isgid) {
  		if ((grp = getgrgid((gid_t)id)) == NULL) {
! 			ERR("%d: unknown gid", id);
  			return 0;
  		}
  		name = grp->gr_name;
  	} else {
  		if ((usr = getpwuid((uid_t)id)) == NULL) {
! 			ERR("%d: unknown uid", id);
  			return 0;
  		}
  		name = usr->pw_name;
  	}
  
  	if ((sz = strlen(name)) > UINT8_MAX) {
! 		ERRX("%d: name too long: %s", id, name);
  		return 0;
  	} else if (sz == 0) {
! 		ERRX("%d: zero-length name", id);
  		return 0;
  	}
  
***************
*** 204,221 ****
  
  	pp = reallocarray(*ids, *idsz + 1, sizeof(struct ident));
  	if (pp == NULL) {
! 		ERR(sess, "reallocarray");
  		return 0;
  	}
  	*ids = pp;
  	(*ids)[*idsz].id = id;
  	(*ids)[*idsz].name = strdup(name);
  	if ((*ids)[*idsz].name == NULL) {
! 		ERR(sess, "strdup");
  		return 0;
  	}
  
! 	LOG4(sess, "adding identifier to list: %s (%u)",
  	    (*ids)[*idsz].name, (*ids)[*idsz].id);
  	(*idsz)++;
  	return 1;
--- 204,221 ----
  
  	pp = reallocarray(*ids, *idsz + 1, sizeof(struct ident));
  	if (pp == NULL) {
! 		ERR("reallocarray");
  		return 0;
  	}
  	*ids = pp;
  	(*ids)[*idsz].id = id;
  	(*ids)[*idsz].name = strdup(name);
  	if ((*ids)[*idsz].name == NULL) {
! 		ERR("strdup");
  		return 0;
  	}
  
! 	LOG4("adding identifier to list: %s (%u)",
  	    (*ids)[*idsz].name, (*ids)[*idsz].id);
  	(*idsz)++;
  	return 1;
***************
*** 239,257 ****
  		sz = strlen(ids[i].name);
  		assert(sz > 0 && sz <= UINT8_MAX);
  		if (!io_write_uint(sess, fd, ids[i].id)) {
! 			ERRX1(sess, "io_write_uint");
  			return 0;
  		} else if (!io_write_byte(sess, fd, sz)) {
! 			ERRX1(sess, "io_write_byte");
  			return 0;
  		} else if (!io_write_buf(sess, fd, ids[i].name, sz)) {
! 			ERRX1(sess, "io_write_buf");
  			return 0;
  		}
  	}
  
  	if (!io_write_int(sess, fd, 0)) {
! 		ERRX1(sess, "io_write_int");
  		return 0;
  	}
  
--- 239,257 ----
  		sz = strlen(ids[i].name);
  		assert(sz > 0 && sz <= UINT8_MAX);
  		if (!io_write_uint(sess, fd, ids[i].id)) {
! 			ERRX1("io_write_uint");
  			return 0;
  		} else if (!io_write_byte(sess, fd, sz)) {
! 			ERRX1("io_write_byte");
  			return 0;
  		} else if (!io_write_buf(sess, fd, ids[i].name, sz)) {
! 			ERRX1("io_write_buf");
  			return 0;
  		}
  	}
  
  	if (!io_write_int(sess, fd, 0)) {
! 		ERRX1("io_write_int");
  		return 0;
  	}
  
***************
*** 274,280 ****
  
  	for (;;) {
  		if (!io_read_uint(sess, fd, &id)) {
! 			ERRX1(sess, "io_read_uint");
  			return 0;
  		} else if (id == 0)
  			break;
--- 274,280 ----
  
  	for (;;) {
  		if (!io_read_uint(sess, fd, &id)) {
! 			ERRX1("io_read_uint");
  			return 0;
  		} else if (id == 0)
  			break;
***************
*** 282,288 ****
  		pp = reallocarray(*ids,
  			*idsz + 1, sizeof(struct ident));
  		if (pp == NULL) {
! 			ERR(sess, "reallocarray");
  			return 0;
  		}
  		*ids = pp;
--- 282,288 ----
  		pp = reallocarray(*ids,
  			*idsz + 1, sizeof(struct ident));
  		if (pp == NULL) {
! 			ERR("reallocarray");
  			return 0;
  		}
  		*ids = pp;
***************
*** 295,313 ****
  		 */
  
  		if (!io_read_byte(sess, fd, &sz)) {
! 			ERRX1(sess, "io_read_byte");
  			return 0;
  		} else if (sz == 0)
! 			WARNX(sess, "zero-length name in identifier list");
  
  		(*ids)[*idsz].id = id;
  		(*ids)[*idsz].name = calloc(sz + 1, 1);
  		if ((*ids)[*idsz].name == NULL) {
! 			ERR(sess, "calloc");
  			return 0;
  		}
  		if (!io_read_buf(sess, fd, (*ids)[*idsz].name, sz)) {
! 			ERRX1(sess, "io_read_buf");
  			return 0;
  		}
  		(*idsz)++;
--- 295,313 ----
  		 */
  
  		if (!io_read_byte(sess, fd, &sz)) {
! 			ERRX1("io_read_byte");
  			return 0;
  		} else if (sz == 0)
! 			WARNX("zero-length name in identifier list");
  
  		(*ids)[*idsz].id = id;
  		(*ids)[*idsz].name = calloc(sz + 1, 1);
  		if ((*ids)[*idsz].name == NULL) {
! 			ERR("calloc");
  			return 0;
  		}
  		if (!io_read_buf(sess, fd, (*ids)[*idsz].name, sz)) {
! 			ERRX1("io_read_buf");
  			return 0;
  		}
  		(*idsz)++;