summaryrefslogtreecommitdiffstats
path: root/contrib/sendmail/src/err.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/sendmail/src/err.c')
-rw-r--r--contrib/sendmail/src/err.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c
index 9e3e572..8b65cf8 100644
--- a/contrib/sendmail/src/err.c
+++ b/contrib/sendmail/src/err.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -12,9 +12,11 @@
*/
#ifndef lint
-static char id[] = "@(#)$Id: err.c,v 8.120.4.2 2001/05/03 17:24:06 gshapiro Exp $";
+static char id[] = "@(#)$Id: err.c,v 8.120.4.1 2000/05/25 18:56:15 gshapiro Exp $";
#endif /* ! lint */
+/* $FreeBSD$ */
+
#include <sendmail.h>
#ifdef LDAPMAP
# include <lber.h>
@@ -107,7 +109,7 @@ syserr(fmt, va_alist)
if (!panic && CurEnv != NULL)
{
if (CurEnv->e_message != NULL)
- sm_free(CurEnv->e_message);
+ free(CurEnv->e_message);
CurEnv->e_message = newstr(errtxt);
}
@@ -122,13 +124,13 @@ syserr(fmt, va_alist)
dprintf("syserr: ExitStat = %d\n", ExitStat);
}
- pw = sm_getpwuid(RealUid);
+ pw = sm_getpwuid(getuid());
if (pw != NULL)
user = pw->pw_name;
else
{
user = ubuf;
- snprintf(ubuf, sizeof ubuf, "UID%d", (int) RealUid);
+ snprintf(ubuf, sizeof ubuf, "UID%d", (int) getuid());
}
if (LogLevel > 0)
@@ -237,7 +239,7 @@ usrerr(fmt, va_alist)
case '5':
case '6':
if (CurEnv->e_message != NULL)
- sm_free(CurEnv->e_message);
+ free(CurEnv->e_message);
if (MsgBuf[0] == '6')
{
char buf[MAXLINE];
@@ -323,7 +325,7 @@ usrerrenh(enhsc, fmt, va_alist)
case '5':
case '6':
if (CurEnv->e_message != NULL)
- sm_free(CurEnv->e_message);
+ free(CurEnv->e_message);
if (MsgBuf[0] == '6')
{
char buf[MAXLINE];
@@ -392,7 +394,7 @@ message(msg, va_alist)
case '5':
if (CurEnv->e_message != NULL)
- sm_free(CurEnv->e_message);
+ free(CurEnv->e_message);
CurEnv->e_message = newstr(errtxt);
break;
}
@@ -446,7 +448,7 @@ nmessage(msg, va_alist)
case '5':
if (CurEnv->e_message != NULL)
- sm_free(CurEnv->e_message);
+ free(CurEnv->e_message);
CurEnv->e_message = newstr(errtxt);
break;
}
OpenPOWER on IntegriCloud