===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/util.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -c -r1.33 -r1.34
*** src/usr.bin/ftp/util.c	2003/04/05 17:19:47	1.33
--- src/usr.bin/ftp/util.c	2003/04/07 22:15:57	1.34
***************
*** 1,6 ****
! /*	$OpenBSD: util.c,v 1.33 2003/04/05 17:19:47 deraadt Exp $	*/
  /*	$NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $	*/
  
  /*
   * Copyright (c) 1985, 1989, 1993, 1994
   *	The Regents of the University of California.  All rights reserved.
--- 1,46 ----
! /*	$OpenBSD: util.c,v 1.34 2003/04/07 22:15:57 millert Exp $	*/
  /*	$NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $	*/
  
+ /*-
+  * Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
+  * All rights reserved.
+  *
+  * This code is derived from software contributed to The NetBSD Foundation
+  * by Luke Mewburn.
+  *
+  * This code is derived from software contributed to The NetBSD Foundation
+  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+  * NASA Ames Research Center.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+  * are met:
+  * 1. Redistributions of source code must retain the above copyright
+  *    notice, this list of conditions and the following disclaimer.
+  * 2. Redistributions in binary form must reproduce the above copyright
+  *    notice, this list of conditions and the following disclaimer in the
+  *    documentation and/or other materials provided with the distribution.
+  * 3. All advertising materials mentioning features or use of this software
+  *    must display the following acknowledgement:
+  *	This product includes software developed by the NetBSD
+  *	Foundation, Inc. and its contributors.
+  * 4. Neither the name of The NetBSD Foundation nor the names of its
+  *    contributors may be used to endorse or promote products derived
+  *    from this software without specific prior written permission.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
  /*
   * Copyright (c) 1985, 1989, 1993, 1994
   *	The Regents of the University of California.  All rights reserved.
***************
*** 35,41 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: util.c,v 1.33 2003/04/05 17:19:47 deraadt Exp $";
  #endif /* not lint */
  
  /*
--- 75,81 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: util.c,v 1.34 2003/04/07 22:15:57 millert Exp $";
  #endif /* not lint */
  
  /*