=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tftp/tftpsubs.c,v retrieving revision 1.5 retrieving revision 1.6 diff -c -r1.5 -r1.6 *** src/usr.bin/tftp/tftpsubs.c 2003/04/17 17:17:27 1.5 --- src/usr.bin/tftp/tftpsubs.c 2003/06/03 02:56:18 1.6 *************** *** 1,4 **** ! /* $OpenBSD: tftpsubs.c,v 1.5 2003/04/17 17:17:27 henning Exp $ */ /* $NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $ */ /* --- 1,4 ---- ! /* $OpenBSD: tftpsubs.c,v 1.6 2003/06/03 02:56:18 millert Exp $ */ /* $NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $ */ /* *************** *** 13,23 **** * 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 University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * --- 13,19 ---- * 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. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * *************** *** 38,44 **** #if 0 static char sccsid[] = "@(#)tftpsubs.c 8.1 (Berkeley) 6/6/93"; #endif ! static const char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.5 2003/04/17 17:17:27 henning Exp $"; #endif /* not lint */ /* Simple minded read-ahead/write-behind subroutines for tftp user and --- 34,40 ---- #if 0 static char sccsid[] = "@(#)tftpsubs.c 8.1 (Berkeley) 6/6/93"; #endif ! static const char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.6 2003/06/03 02:56:18 millert Exp $"; #endif /* not lint */ /* Simple minded read-ahead/write-behind subroutines for tftp user and