===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/talk/invite.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/talk/invite.c	2003/09/26 04:41:48	1.11
--- src/usr.bin/talk/invite.c	2004/03/02 21:04:42	1.12
***************
*** 1,4 ****
! /*	$OpenBSD: invite.c,v 1.11 2003/09/26 04:41:48 deraadt Exp $	*/
  /*	$NetBSD: invite.c,v 1.3 1994/12/09 02:14:18 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: invite.c,v 1.12 2004/03/02 21:04:42 tedu Exp $	*/
  /*	$NetBSD: invite.c,v 1.3 1994/12/09 02:14:18 jtc Exp $	*/
  
  /*
***************
*** 34,40 ****
  #if 0
  static char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: invite.c,v 1.11 2003/09/26 04:41:48 deraadt Exp $";
  #endif /* not lint */
  
  #include "talk.h"
--- 34,40 ----
  #if 0
  static char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
  #endif
! static const char rcsid[] = "$OpenBSD: invite.c,v 1.12 2004/03/02 21:04:42 tedu Exp $";
  #endif /* not lint */
  
  #include "talk.h"
***************
*** 70,76 ****
  	struct itimerval itimer;
  	CTL_RESPONSE response;
  	struct sockaddr rp;
! 	int rplen = sizeof(struct sockaddr);
  	struct hostent *rphost;
  	char rname[STRING_LENGTH];
  
--- 70,76 ----
  	struct itimerval itimer;
  	CTL_RESPONSE response;
  	struct sockaddr rp;
! 	socklen_t rplen = sizeof(struct sockaddr);
  	struct hostent *rphost;
  	char rname[STRING_LENGTH];
  
***************
*** 101,107 ****
  	message("Waiting for your party to respond");
  	signal(SIGALRM, re_invite);
  	(void) setjmp(invitebuf);
! 	while ((new_sockt = accept(sockt, &rp, &rplen)) < 0) {
  		if (errno == EINTR || errno == ECONNABORTED)
  			continue;
  		quit("Unable to connect with your party", 1);
--- 101,107 ----
  	message("Waiting for your party to respond");
  	signal(SIGALRM, re_invite);
  	(void) setjmp(invitebuf);
! 	while ((new_sockt = accept(sockt, &rp, &rplen)) == -1) {
  		if (errno == EINTR || errno == ECONNABORTED)
  			continue;
  		quit("Unable to connect with your party", 1);