===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/talk/ctl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/talk/ctl.c	1998/08/18 04:02:09	1.4
--- src/usr.bin/talk/ctl.c	1999/03/03 20:43:30	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: ctl.c,v 1.4 1998/08/18 04:02:09 millert Exp $	*/
  /*	$NetBSD: ctl.c,v 1.3 1994/12/09 02:14:10 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ctl.c,v 1.5 1999/03/03 20:43:30 millert Exp $	*/
  /*	$NetBSD: ctl.c,v 1.3 1994/12/09 02:14:10 jtc Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)ctl.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: ctl.c,v 1.4 1998/08/18 04:02:09 millert Exp $";
  #endif /* not lint */
  
  /*
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)ctl.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: ctl.c,v 1.5 1999/03/03 20:43:30 millert Exp $";
  #endif /* not lint */
  
  /*
***************
*** 76,87 ****
  	my_addr.sin_port = 0;
  	sockt = socket(AF_INET, SOCK_STREAM, 0);
  	if (sockt <= 0)
! 		p_error("Bad socket");
  	if (bind(sockt, (struct sockaddr *)&my_addr, sizeof(my_addr)) != 0)
! 		p_error("Binding local socket");
  	length = sizeof(my_addr);
  	if (getsockname(sockt, (struct sockaddr *)&my_addr, &length) == -1)
! 		p_error("Bad address for socket");
  }
  
  /* open the ctl socket */
--- 76,87 ----
  	my_addr.sin_port = 0;
  	sockt = socket(AF_INET, SOCK_STREAM, 0);
  	if (sockt <= 0)
! 		quit("Bad socket", 1);
  	if (bind(sockt, (struct sockaddr *)&my_addr, sizeof(my_addr)) != 0)
! 		quit("Binding local socket", 1);
  	length = sizeof(my_addr);
  	if (getsockname(sockt, (struct sockaddr *)&my_addr, &length) == -1)
! 		quit("Bad address for socket", 1);
  }
  
  /* open the ctl socket */
***************
*** 94,107 ****
  	ctl_addr.sin_addr = my_machine_addr;
  	ctl_sockt = socket(AF_INET, SOCK_DGRAM, 0);
  	if (ctl_sockt <= 0)
! 		p_error("Bad socket");
  	if (bind(ctl_sockt,
  	    (struct sockaddr *)&ctl_addr, sizeof(ctl_addr)) != 0)
! 		p_error("Couldn't bind to control socket");
  	length = sizeof(ctl_addr);
  	if (getsockname(ctl_sockt,
  	    (struct sockaddr *)&ctl_addr, &length) == -1)
! 		p_error("Bad address for ctl socket");
  }
  
  /* print_addr is a debug print routine */
--- 94,107 ----
  	ctl_addr.sin_addr = my_machine_addr;
  	ctl_sockt = socket(AF_INET, SOCK_DGRAM, 0);
  	if (ctl_sockt <= 0)
! 		quit("Bad socket", 1);
  	if (bind(ctl_sockt,
  	    (struct sockaddr *)&ctl_addr, sizeof(ctl_addr)) != 0)
! 		quit("Couldn't bind to control socket", 1);
  	length = sizeof(ctl_addr);
  	if (getsockname(ctl_sockt,
  	    (struct sockaddr *)&ctl_addr, &length) == -1)
! 		quit("Bad address for ctl socket", 1);
  }
  
  /* print_addr is a debug print routine */