BSD 4_3_Tahoe release

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

diff --git a/usr/src/usr.lib/sendmail/src/alias.c b/usr/src/usr.lib/sendmail/src/alias.c
index f322342..1c29b21 100644 (file)
--- a/usr/src/usr.lib/sendmail/src/alias.c
+++ b/usr/src/usr.lib/sendmail/src/alias.c
@@ -1,12 +1,28 @@
 /*
 /*

-**  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
+#ifdef DBM
+static char sccsid[] = "@(#)alias.c    5.16 (Berkeley) 7/14/88 (with DBM)";
+#else
+static char sccsid[] = "@(#)alias.c    5.16 (Berkeley) 7/14/88 (without DBM)";
+#endif
+#endif /* not lint */

 
 # include <pwd.h>
 # include <sys/types.h>
 
 # include <pwd.h>
 # include <sys/types.h>


@@ -14,18 +30,7 @@
 # include <signal.h>
 # include <errno.h>
 # include "sendmail.h"
 # include <signal.h>
 # include <errno.h>
 # include "sendmail.h"

-# ifdef FLOCK

 # include <sys/file.h>
 # include <sys/file.h>

-# endif FLOCK
-
-#ifndef lint
-# ifdef DBM
-static char    SccsId[] = "@(#)alias.c 5.13 (Berkeley) 4/17/86 (with DBM)";
-# else DBM
-static char    SccsId[] = "@(#)alias.c 5.13 (Berkeley) 4/17/86 (without DBM)";
-# endif DBM
-#endif not lint
-

 
 /*
 **  ALIAS -- Compute aliases.
 
 /*
 **  ALIAS -- Compute aliases.


@@ -330,7 +335,6 @@ readaliases(aliasfile, init)
        }
 
 # ifdef DBM
        }
 
 # ifdef DBM

-# ifdef FLOCK

        /* see if someone else is rebuilding the alias file already */
        if (flock(fileno(af), LOCK_EX | LOCK_NB) < 0 && errno == EWOULDBLOCK)
        {
        /* see if someone else is rebuilding the alias file already */
        if (flock(fileno(af), LOCK_EX | LOCK_NB) < 0 && errno == EWOULDBLOCK)
        {


@@ -345,7 +349,6 @@ readaliases(aliasfile, init)
                errno = 0;
                return;
        }
                errno = 0;
                return;
        }

-# endif FLOCK

 # endif DBM
 
        /*
 # endif DBM
 
        /*