summaryrefslogtreecommitdiffstats
path: root/contrib/sendmail/makemap
diff options
context:
space:
mode:
authorgshapiro <gshapiro@FreeBSD.org>2000-10-01 02:03:50 +0000
committergshapiro <gshapiro@FreeBSD.org>2000-10-01 02:03:50 +0000
commit1bbf49b55a2601a4b47f84ef0db64d5bbc97608f (patch)
tree8243eef774bd2693d62f2204f2be075a5b646c32 /contrib/sendmail/makemap
parent0cc8aac437ca5de8f94291323499241c949261f9 (diff)
downloadFreeBSD-src-1bbf49b55a2601a4b47f84ef0db64d5bbc97608f.zip
FreeBSD-src-1bbf49b55a2601a4b47f84ef0db64d5bbc97608f.tar.gz
Fix conflicts from merge of sendmail 8.11.1
Diffstat (limited to 'contrib/sendmail/makemap')
-rw-r--r--contrib/sendmail/makemap/makemap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c
index 33acfb8..0506dc4 100644
--- a/contrib/sendmail/makemap/makemap.c
+++ b/contrib/sendmail/makemap/makemap.c
@@ -21,7 +21,7 @@ static char copyright[] =
#endif /* ! lint */
#ifndef lint
-static char id[] = "@(#)$Id: makemap.c,v 8.135.4.10 2000/07/18 05:41:39 gshapiro Exp $";
+static char id[] = "@(#)$Id: makemap.c,v 8.135.4.11 2000/09/13 01:11:10 gshapiro Exp $";
#endif /* ! lint */
/* $FreeBSD$ */
@@ -339,7 +339,7 @@ main(argc, argv)
(void) database->smdb_sync(database, 0);
- if (geteuid() == 0 && TrustedUid != 0)
+ if (!unmake && geteuid() == 0 && TrustedUid != 0)
{
errno = database->smdb_set_owner(database, TrustedUid, -1);
if (errno != SMDBE_OK)
OpenPOWER on IntegriCloud