===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdistd/server.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/rdistd/server.c	2011/04/10 15:47:28	1.22
--- src/usr.bin/rdistd/server.c	2012/11/12 01:14:41	1.23
***************
*** 1,4 ****
! /*	$OpenBSD: server.c,v 1.22 2011/04/10 15:47:28 krw Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: server.c,v 1.23 2012/11/12 01:14:41 guenther Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
***************
*** 656,663 ****
  	case S_IFIFO:
  #endif
  #endif
! 		(void) sendcmd(QC_YES, "%lld %ld %o %s %s",
! 			       (long long) stb.st_size, stb.st_mtime,
  			       stb.st_mode & 07777,
  			       getusername(stb.st_uid, target, options), 
  			       getgroupname(stb.st_gid, target, options));
--- 656,664 ----
  	case S_IFIFO:
  #endif
  #endif
! 		(void) sendcmd(QC_YES, "%lld %lld %o %s %s",
! 			       (long long) stb.st_size,
! 			       (long long) stb.st_mtime,
  			       stb.st_mode & 07777,
  			       getusername(stb.st_uid, target, options), 
  			       getgroupname(stb.st_gid, target, options));
***************
*** 680,686 ****
  	struct stat stb;
  	int r = -1;
  
! 	debugmsg(DM_CALL, "chkparent(%s, %o) start\n", name, opts);
  
  	cp = strrchr(name, '/');
  	if (cp == NULL || cp == name)
--- 681,687 ----
  	struct stat stb;
  	int r = -1;
  
! 	debugmsg(DM_CALL, "chkparent(%s, %lo) start\n", name, opts);
  
  	cp = strrchr(name, '/');
  	if (cp == NULL || cp == name)
***************
*** 695,701 ****
  				r = 0;
  			} else 
  				debugmsg(DM_MISC, 
! 					 "chkparent(%s, %o) mkdir fail: %s\n",
  					 name, opts, SYSERR);
  		}
  	} else	/* It exists */
--- 696,702 ----
  				r = 0;
  			} else 
  				debugmsg(DM_MISC, 
! 					 "chkparent(%s, %lo) mkdir fail: %s\n",
  					 name, opts, SYSERR);
  		}
  	} else	/* It exists */
***************
*** 1428,1434 ****
  	/*
  	 * Get modification time
  	 */
! 	mtime = (time_t) strtol(cp, &cp, 10);
  	if (*cp++ != ' ') {
  		error("recvit: mtime not delimited");
  		return;
--- 1429,1435 ----
  	/*
  	 * Get modification time
  	 */
! 	mtime = (time_t) strtoll(cp, &cp, 10);
  	if (*cp++ != ' ') {
  		error("recvit: mtime not delimited");
  		return;
***************
*** 1437,1443 ****
  	/*
  	 * Get access time
  	 */
! 	atime = strtol(cp, &cp, 10);
  	if (*cp++ != ' ') {
  		error("recvit: atime not delimited");
  		return;
--- 1438,1444 ----
  	/*
  	 * Get access time
  	 */
! 	atime = (time_t) strtoll(cp, &cp, 10);
  	if (*cp++ != ' ') {
  		error("recvit: atime not delimited");
  		return;
***************
*** 1477,1484 ****
  	file = fileb;
  
  	debugmsg(DM_MISC,
! 		 "recvit: opts = %04o mode = %04o size = %lld mtime = %d",
! 		 opts, mode, (long long) size, mtime);
  	debugmsg(DM_MISC,
         "recvit: owner = '%s' group = '%s' file = '%s' catname = %d isdir = %d",
  		 owner, group, file, catname, (type == S_IFDIR) ? 1 : 0);
--- 1478,1485 ----
  	file = fileb;
  
  	debugmsg(DM_MISC,
! 		 "recvit: opts = %04lo mode = %04o size = %lld mtime = %lld",
! 		 opts, mode, (long long) size, (long long)mtime);
  	debugmsg(DM_MISC,
         "recvit: owner = '%s' group = '%s' file = '%s' catname = %d isdir = %d",
  		 owner, group, file, catname, (type == S_IFDIR) ? 1 : 0);
***************
*** 1633,1639 ****
  	file = fileb;
  
  	debugmsg(DM_MISC,
! 		 "dochmog: opts = %04o mode = %04o", opts, mode);
  	debugmsg(DM_MISC,
  	         "dochmog: owner = '%s' group = '%s' file = '%s' catname = %d",
  		 owner, group, file, catname);
--- 1634,1640 ----
  	file = fileb;
  
  	debugmsg(DM_MISC,
! 		 "dochmog: opts = %04lo mode = %04o", opts, mode);
  	debugmsg(DM_MISC,
  	         "dochmog: owner = '%s' group = '%s' file = '%s' catname = %d",
  		 owner, group, file, catname);