BSD 4_4 release

[unix-history] / usr / src / usr.sbin / sendmail / src / map.c

diff --git a/usr/src/usr.sbin/sendmail/src/map.c b/usr/src/usr.sbin/sendmail/src/map.c
index 8bb8677..ef53f23 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/map.c
+++ b/usr/src/usr.sbin/sendmail/src/map.c
@@ -1,13 +1,39 @@
 /*
  * Copyright (c) 1992 Eric P. Allman.
 /*
  * Copyright (c) 1992 Eric P. Allman.

- * Copyright (c) 1992 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)map.c      6.23 (Berkeley) %G%";
+static char sccsid[] = "@(#)map.c      8.1 (Berkeley) 6/7/93";

 #endif /* not lint */
 
 #include "sendmail.h"
 #endif /* not lint */
 
 #include "sendmail.h"


@@ -332,7 +358,8 @@ map_init(s, rebuild)
 
        if (rebuild)
        {
 
        if (rebuild)
        {

-               if (bitset(MCF_REBUILDABLE, map->map_class->map_cflags))
+               if (bitset(MF_ALIAS, map->map_mflags) &&
+                   bitset(MCF_REBUILDABLE, map->map_class->map_cflags))

                        rebuildaliases(map, FALSE);
        }
        else
                        rebuildaliases(map, FALSE);
        }
        else


@@ -385,7 +412,7 @@ ndbm_map_open(map, mode)
        }
        map->map_db1 = (void *) dbm;
        if (mode == O_RDONLY && bitset(MF_ALIAS, map->map_mflags))
        }
        map->map_db1 = (void *) dbm;
        if (mode == O_RDONLY && bitset(MF_ALIAS, map->map_mflags))

-               aliaswait(map, ".dir");
+               aliaswait(map, ".pag");

        return TRUE;
 }
 
        return TRUE;
 }
 


@@ -498,13 +525,21 @@ ndbm_map_close(map)
 
 #endif
 \f/*
 
 #endif
 \f/*

-**  HASH (NEWDB) Modules
+**  NEWDB (Hash and BTree) Modules

 */
 
 #ifdef NEWDB
 
 /*
 */
 
 #ifdef NEWDB
 
 /*

-**  BTREE_MAP_PARSE -- BTREE-style map initialization
+**  BT_MAP_OPEN, HASH_MAP_OPEN -- database open primitives.
+**
+**     These do rather bizarre locking.  If you can lock on open,
+**     do that to avoid the condition of opening a database that
+**     is being rebuilt.  If you don't, we'll try to fake it, but
+**     there will be a race condition.  If opening for read-only,
+**     we immediately release the lock to avoid freezing things up.
+**     We really ought to hold the lock, but guarantee that we won't
+**     be pokey about it.  That's hard to do.

 */
 
 bool
 */
 
 bool


@@ -514,25 +549,52 @@ bt_map_open(map, mode)
 {
        DB *db;
        int i;
 {
        DB *db;
        int i;

+       int omode;

        char buf[MAXNAME];
 
        if (tTd(38, 2))
                printf("bt_map_open(%s, %d)\n", map->map_file, mode);
 
        char buf[MAXNAME];
 
        if (tTd(38, 2))
                printf("bt_map_open(%s, %d)\n", map->map_file, mode);
 

-       if (mode == O_RDWR)
-               mode |= O_CREAT|O_TRUNC;
+       omode = mode;
+       if (omode == O_RDWR)
+       {
+               omode |= O_CREAT|O_TRUNC;
+#if defined(O_EXLOCK) && !defined(LOCKF)
+               omode |= O_EXLOCK;
+# if !defined(OLD_NEWDB)
+       }
+       else
+       {
+               omode |= O_SHLOCK;
+# endif
+#endif
+       }

 
        (void) strcpy(buf, map->map_file);
        i = strlen(buf);
        if (i < 3 || strcmp(&buf[i - 3], ".db") != 0)
                (void) strcat(buf, ".db");
 
        (void) strcpy(buf, map->map_file);
        i = strlen(buf);
        if (i < 3 || strcmp(&buf[i - 3], ".db") != 0)
                (void) strcat(buf, ".db");

-       db = dbopen(buf, mode, DBMMODE, DB_BTREE, NULL);
+       db = dbopen(buf, omode, DBMMODE, DB_BTREE, NULL);

        if (db == NULL)
        {
                if (!bitset(MF_OPTIONAL, map->map_mflags))
                        syserr("Cannot open BTREE database %s", map->map_file);
                return FALSE;
        }
        if (db == NULL)
        {
                if (!bitset(MF_OPTIONAL, map->map_mflags))
                        syserr("Cannot open BTREE database %s", map->map_file);
                return FALSE;
        }

+#if !defined(OLD_NEWDB) && !defined(LOCKF)
+# if !defined(O_EXLOCK)
+       if (mode == O_RDWR)
+               (void) lockfile(db->fd(db), map->map_file, LOCK_EX);
+# else
+       if (mode == O_RDONLY)
+               (void) lockfile(db->fd(db), map->map_file, LOCK_UN);
+# endif
+#endif
+
+       /* try to make sure that at least the database header is on disk */
+       if (mode == O_RDWR)
+               (void) db->sync(db, 0);
+

        map->map_db2 = (void *) db;
        if (mode == O_RDONLY && bitset(MF_ALIAS, map->map_mflags))
                aliaswait(map, ".db");
        map->map_db2 = (void *) db;
        if (mode == O_RDONLY && bitset(MF_ALIAS, map->map_mflags))
                aliaswait(map, ".db");


@@ -551,25 +613,52 @@ hash_map_open(map, mode)
 {
        DB *db;
        int i;
 {
        DB *db;
        int i;

+       int omode;

        char buf[MAXNAME];
 
        if (tTd(38, 2))
                printf("hash_map_open(%s, %d)\n", map->map_file, mode);
 
        char buf[MAXNAME];
 
        if (tTd(38, 2))
                printf("hash_map_open(%s, %d)\n", map->map_file, mode);
 

-       if (mode == O_RDWR)
-               mode |= O_CREAT|O_TRUNC;
+       omode = mode;
+       if (omode == O_RDWR)
+       {
+               omode |= O_CREAT|O_TRUNC;
+#if defined(O_EXLOCK) && !defined(LOCKF)
+               omode |= O_EXLOCK;
+# if !defined(OLD_NEWDB)
+       }
+       else
+       {
+               omode |= O_SHLOCK;
+# endif
+#endif
+       }

 
        (void) strcpy(buf, map->map_file);
        i = strlen(buf);
        if (i < 3 || strcmp(&buf[i - 3], ".db") != 0)
                (void) strcat(buf, ".db");
 
        (void) strcpy(buf, map->map_file);
        i = strlen(buf);
        if (i < 3 || strcmp(&buf[i - 3], ".db") != 0)
                (void) strcat(buf, ".db");

-       db = dbopen(buf, mode, DBMMODE, DB_HASH, NULL);
+       db = dbopen(buf, omode, DBMMODE, DB_HASH, NULL);

        if (db == NULL)
        {
                if (!bitset(MF_OPTIONAL, map->map_mflags))
                        syserr("Cannot open HASH database %s", map->map_file);
                return FALSE;
        }
        if (db == NULL)
        {
                if (!bitset(MF_OPTIONAL, map->map_mflags))
                        syserr("Cannot open HASH database %s", map->map_file);
                return FALSE;
        }

+#if !defined(OLD_NEWDB) && !defined(LOCKF)
+# if !defined(O_EXLOCK)
+       if (mode == O_RDWR)
+               (void) lockfile(db->fd(db), map->map_file, LOCK_EX);
+# else
+       if (mode == O_RDONLY)
+               (void) lockfile(db->fd(db), map->map_file, LOCK_UN);
+# endif
+#endif
+
+       /* try to make sure that at least the database header is on disk */
+       if (mode == O_RDWR)
+               (void) db->sync(db, 0);
+

        map->map_db2 = (void *) db;
        if (mode == O_RDONLY && bitset(MF_ALIAS, map->map_mflags))
                aliaswait(map, ".db");
        map->map_db2 = (void *) db;
        if (mode == O_RDONLY && bitset(MF_ALIAS, map->map_mflags))
                aliaswait(map, ".db");


@@ -831,9 +920,11 @@ nis_map_close(map)
 */
 
 char *
 */
 
 char *

-stab_map_lookup(map, name)
+stab_map_lookup(map, name, av, pstat)

        register MAP *map;
        char *name;
        register MAP *map;
        char *name;

+       char **av;
+       int *pstat;

 {
        register STAB *s;
 
 {
        register STAB *s;
 


@@ -878,8 +969,6 @@ stab_map_open(map, mode)
        register MAP *map;
        int mode;
 {
        register MAP *map;
        int mode;
 {

-       FILE *af;
-

        if (tTd(38, 2))
                printf("stab_map_open(%s)\n", map->map_file);
 
        if (tTd(38, 2))
                printf("stab_map_open(%s)\n", map->map_file);