diff options
| author | gene <gene@cvs.openbsd.org> | 1997-11-09 04:05:49 +0000 |
|---|---|---|
| committer | gene <gene@cvs.openbsd.org> | 1997-11-09 04:05:49 +0000 |
| commit | 5ffedb7ce00b68fe114660b0a38b949225691abf (patch) | |
| tree | aef5ccb69f26f8e35e8f93872633a50780c69faf /usr.sbin/sendmail/makemap | |
| parent | 9c3ade9a06cde621c1cd6f71484c00f8c6a93e56 (diff) | |
Upgrade to sendmail 8.8.8
Diffstat (limited to 'usr.sbin/sendmail/makemap')
| -rw-r--r-- | usr.sbin/sendmail/makemap/makemap.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/usr.sbin/sendmail/makemap/makemap.c b/usr.sbin/sendmail/makemap/makemap.c index e4dff21343f..3a04a0b6cd5 100644 --- a/usr.sbin/sendmail/makemap/makemap.c +++ b/usr.sbin/sendmail/makemap/makemap.c @@ -33,7 +33,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)makemap.c 8.37 (Berkeley) 7/10/97"; +static char sccsid[] = "@(#)makemap.c 8.38 (Berkeley) 9/23/97"; #endif /* not lint */ #include <sys/types.h> @@ -363,13 +363,6 @@ main(argc, argv) pbuf, errstring(st)); exit(EX_CANTCREAT); } - if (std.st_dev == stp.st_dev && std.st_ino == stp.st_ino) - { - fprintf(stderr, - "%s: cannot run with GDBM\n", - mapname); - exit(EX_CONFIG); - } break; #endif default: @@ -407,6 +400,14 @@ main(argc, argv) #ifdef NDBM case T_DBM: dbp.dbm = dbm_open(mapname, mode, 0644); + if (dbp.dbm != NULL && + dbm_dirfno(dbp.dbm) == dbm_pagfno(dbp.dbm)) + { + fprintf(stderr, "dbm map %s: cannot run with GDBM\n", + mapname); + dbm_close(dbp.dbm); + exit(EX_CONFIG); + } if (!ignoresafeties && dbp.dbm != NULL && (filechanged(dbuf, dbm_dirfno(dbp.dbm), &std, sff) || filechanged(pbuf, dbm_pagfno(dbp.dbm), &stp, sff))) |