BSD 4_3_Tahoe release

[unix-history] / usr / src / usr.lib / sendmail / src / macro.c

diff --git a/usr/src/usr.lib/sendmail/src/macro.c b/usr/src/usr.lib/sendmail/src/macro.c
index 19e5df5..e74f884 100644 (file)
--- a/usr/src/usr.lib/sendmail/src/macro.c
+++ b/usr/src/usr.lib/sendmail/src/macro.c
@@ -1,16 +1,24 @@
 /*
 /*

-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, 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.
-*/
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */

 
 #ifndef lint
 
 #ifndef lint

-static char    SccsId[] = "@(#)macro.c 5.3 (Berkeley) 9/19/85";
-#endif not lint
+static char sccsid[] = "@(#)macro.c    5.5 (Berkeley) 6/30/88";
+#endif /* not lint */

 
 # include "sendmail.h"
 
 
 # include "sendmail.h"