diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2007-11-05 00:09:45 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2007-11-05 00:09:45 +0000 |
| commit | a0436b087f99fde1580c8aaabe8fdf0c6a881494 (patch) | |
| tree | 98c9cb304c637ab2a81b47a158818cd8df540da6 /contrib/sendmail/makemap/makemap.c | |
| parent | ea10b54a1ae8522fb04881e6f844b437d3efc0c0 (diff) | |
| download | FreeBSD-src-a0436b087f99fde1580c8aaabe8fdf0c6a881494.zip FreeBSD-src-a0436b087f99fde1580c8aaabe8fdf0c6a881494.tar.gz | |
Resolve conflicts from sendmail 8.14.2 import
Diffstat (limited to 'contrib/sendmail/makemap/makemap.c')
| -rw-r--r-- | contrib/sendmail/makemap/makemap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c index 344d5b9..7302748 100644 --- a/contrib/sendmail/makemap/makemap.c +++ b/contrib/sendmail/makemap/makemap.c @@ -20,7 +20,7 @@ SM_IDSTR(copyright, Copyright (c) 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.177 2004/08/03 23:57:24 ca Exp $") +SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.178 2007/05/11 18:45:39 ca Exp $") #include <sys/types.h> @@ -42,7 +42,7 @@ uid_t RealUid; gid_t RealGid; char *RealUserName; uid_t RunAsUid; -uid_t RunAsGid; +gid_t RunAsGid; char *RunAsUserName; int Verbose = 2; bool DontInitGroups = false; |
