BSD 4_3_Reno release

[unix-history] / usr / src / usr.sbin / timed / timed / globals.h

diff --git a/usr/src/usr.sbin/timed/timed/globals.h b/usr/src/usr.sbin/timed/timed/globals.h
index cb4638e..ff94199 100644 (file)
--- a/usr/src/usr.sbin/timed/timed/globals.h
+++ b/usr/src/usr.sbin/timed/timed/globals.h
@@ -1,11 +1,24 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * 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.
+ *
+ *     @(#)globals.h   2.7 (Berkeley) 6/1/90

  */
 
  */
 

-/*     @(#)globals.h   2.4     (Berkeley)      %G%     */
-

 #include <sys/param.h>
 #include <stdio.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <stdio.h>
 #include <sys/time.h>