svn commit: r263832 - stable/9/libexec/bootpd/tools/bootptest

[Christian Brueffer]

Author: brueffer
Date: Thu Mar 27 20:14:50 2014
New Revision: 263832
URL: http://svnweb.freebsd.org/changeset/base/263832

Log:
  MFC: r263121
  
  Re-format the license to conform to our BSD license template as much
  as possible.  This does not change the wording in any way.
  
  Remove the 3rd clause ("advertising clause") of the BSD license as
  permitted by the University of Berkeley on July 22, 1999.  While the
  clause itself mentions Lawrence Berkeley Laboratory, UCB is the sole
  copyright holder of this file.
  
  Reviewed by:    imp, emaste, eadler

Modified:
  stable/9/libexec/bootpd/tools/bootptest/print-bootp.c
Directory Properties:
  stable/9/libexec/bootpd/   (props changed)

Modified: stable/9/libexec/bootpd/tools/bootptest/print-bootp.c
==============================================================================
--- stable/9/libexec/bootpd/tools/bootptest/print-bootp.c	Thu Mar 27 20:14:40 2014	(r263831)
+++ stable/9/libexec/bootpd/tools/bootptest/print-bootp.c	Thu Mar 27 20:14:50 2014	(r263832)
@@ -1,19 +1,18 @@
 /*
- * Copyright (c) 1988-1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988-1990
+ *      The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' 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.
+ * modification, are permitted provided that:
+ * 1. Source code distributions retain the above copyright
+ *    notice and this paragraph in its entirety
+ * 2. Distributions including binary code include the above copyright
+ *    notice and this paragraph in its entirety in the documentation
+ *    or other materials provided with the distribution, and 
+ * 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.
+ *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.