===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/xinstall/xinstall.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -c -r1.54 -r1.55
*** src/usr.bin/xinstall/xinstall.c	2013/06/02 01:41:23	1.54
--- src/usr.bin/xinstall/xinstall.c	2013/11/26 21:08:10	1.55
***************
*** 1,4 ****
! /*	$OpenBSD: xinstall.c,v 1.54 2013/06/02 01:41:23 naddy Exp $	*/
  /*	$NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: xinstall.c,v 1.55 2013/11/26 21:08:10 deraadt Exp $	*/
  /*	$NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $	*/
  
  /*
***************
*** 151,160 ****
  		safecopy = 1;
  
  	/* get group and owner id's */
! 	if (group && !(gp = getgrnam(group)) && !isdigit(*group))
  		errx(EX_NOUSER, "unknown group %s", group);
  	gid = (group) ? ((gp) ? gp->gr_gid : (gid_t)strtoul(group, NULL, 10)) : (gid_t)-1;
! 	if (owner && !(pp = getpwnam(owner)) && !isdigit(*owner))
  		errx(EX_NOUSER, "unknown user %s", owner);
  	uid = (owner) ? ((pp) ? pp->pw_uid : (uid_t)strtoul(owner, NULL, 10)) : (uid_t)-1;
  
--- 151,160 ----
  		safecopy = 1;
  
  	/* get group and owner id's */
! 	if (group && !(gp = getgrnam(group)) && !isdigit((unsigned char)*group))
  		errx(EX_NOUSER, "unknown group %s", group);
  	gid = (group) ? ((gp) ? gp->gr_gid : (gid_t)strtoul(group, NULL, 10)) : (gid_t)-1;
! 	if (owner && !(pp = getpwnam(owner)) && !isdigit((unsigned char)*owner))
  		errx(EX_NOUSER, "unknown user %s", owner);
  	uid = (owner) ? ((pp) ? pp->pw_uid : (uid_t)strtoul(owner, NULL, 10)) : (uid_t)-1;