From a0436b087f99fde1580c8aaabe8fdf0c6a881494 Mon Sep 17 00:00:00 2001
From: gshapiro <gshapiro@FreeBSD.org>
Date: Mon, 5 Nov 2007 00:09:45 +0000
Subject: Resolve conflicts from sendmail 8.14.2 import

---
 contrib/sendmail/praliases/praliases.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'contrib/sendmail/praliases/praliases.c')

diff --git a/contrib/sendmail/praliases/praliases.c b/contrib/sendmail/praliases/praliases.c
index 720fa6d..984981f 100644
--- a/contrib/sendmail/praliases/praliases.c
+++ b/contrib/sendmail/praliases/praliases.c
@@ -20,7 +20,7 @@ SM_IDSTR(copyright,
      Copyright (c) 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n")
 
-SM_IDSTR(id, "@(#)$Id: praliases.c,v 8.93 2001/09/11 04:05:07 gshapiro Exp $")
+SM_IDSTR(id, "@(#)$Id: praliases.c,v 8.94 2007/05/11 18:50:36 ca Exp $")
 
 #include <sys/types.h>
 #include <ctype.h>
@@ -45,7 +45,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;
-- 
cgit v1.1