diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2001-05-28 17:10:35 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2001-05-28 17:10:35 +0000 |
| commit | fe77e70108d5e4da42ec6ee7e4f1bfaccd64ef04 (patch) | |
| tree | 94f6971eb38134bbccc202099b9cf11ca0d5b908 /contrib/sendmail/src/err.c | |
| parent | 175e3eb50e42986bc6de77adab1f3e58878b2a88 (diff) | |
| download | FreeBSD-src-fe77e70108d5e4da42ec6ee7e4f1bfaccd64ef04.zip FreeBSD-src-fe77e70108d5e4da42ec6ee7e4f1bfaccd64ef04.tar.gz | |
Resolve conflicts from 8.11.4 import
Diffstat (limited to 'contrib/sendmail/src/err.c')
| -rw-r--r-- | contrib/sendmail/src/err.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c index 8b65cf8..c8a69de 100644 --- a/contrib/sendmail/src/err.c +++ b/contrib/sendmail/src/err.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -12,7 +12,7 @@ */ #ifndef lint -static char id[] = "@(#)$Id: err.c,v 8.120.4.1 2000/05/25 18:56:15 gshapiro Exp $"; +static char id[] = "@(#)$Id: err.c,v 8.120.4.2 2001/05/03 17:24:06 gshapiro Exp $"; #endif /* ! lint */ /* $FreeBSD$ */ @@ -109,7 +109,7 @@ syserr(fmt, va_alist) if (!panic && CurEnv != NULL) { if (CurEnv->e_message != NULL) - free(CurEnv->e_message); + sm_free(CurEnv->e_message); CurEnv->e_message = newstr(errtxt); } @@ -124,13 +124,13 @@ syserr(fmt, va_alist) dprintf("syserr: ExitStat = %d\n", ExitStat); } - pw = sm_getpwuid(getuid()); + pw = sm_getpwuid(RealUid); if (pw != NULL) user = pw->pw_name; else { user = ubuf; - snprintf(ubuf, sizeof ubuf, "UID%d", (int) getuid()); + snprintf(ubuf, sizeof ubuf, "UID%d", (int) RealUid); } if (LogLevel > 0) @@ -239,7 +239,7 @@ usrerr(fmt, va_alist) case '5': case '6': if (CurEnv->e_message != NULL) - free(CurEnv->e_message); + sm_free(CurEnv->e_message); if (MsgBuf[0] == '6') { char buf[MAXLINE]; @@ -325,7 +325,7 @@ usrerrenh(enhsc, fmt, va_alist) case '5': case '6': if (CurEnv->e_message != NULL) - free(CurEnv->e_message); + sm_free(CurEnv->e_message); if (MsgBuf[0] == '6') { char buf[MAXLINE]; @@ -394,7 +394,7 @@ message(msg, va_alist) case '5': if (CurEnv->e_message != NULL) - free(CurEnv->e_message); + sm_free(CurEnv->e_message); CurEnv->e_message = newstr(errtxt); break; } @@ -448,7 +448,7 @@ nmessage(msg, va_alist) case '5': if (CurEnv->e_message != NULL) - free(CurEnv->e_message); + sm_free(CurEnv->e_message); CurEnv->e_message = newstr(errtxt); break; } |
