summaryrefslogtreecommitdiff
path: root/usr.sbin/sendmail/src/parseaddr.c
diff options
context:
space:
mode:
authorglass <glass@NetBSD.org>1993-07-20 18:10:14 +0000
committerglass <glass@NetBSD.org>1993-07-20 18:10:14 +0000
commitf2a0b0fbdfaab79400df65d1d67a7907cd444fcd (patch)
tree91d3b9b68c90ea6f29e5c35c89279b2a3155d66a /usr.sbin/sendmail/src/parseaddr.c
parent9d232f6caedf55736719cf3417d56f907bf9c5ee (diff)
Upgraded sendmail from revision 8.1C to 8.3;
this version of sendmail tries to use sysconf() if the _SC_* macros are defined in unistd.h. We have the macros but not the function. A temporary "fix" has been made to avoid the issue.
Diffstat (limited to 'usr.sbin/sendmail/src/parseaddr.c')
-rw-r--r--usr.sbin/sendmail/src/parseaddr.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.sbin/sendmail/src/parseaddr.c b/usr.sbin/sendmail/src/parseaddr.c
index 3e4beb540c5..8951cac01cf 100644
--- a/usr.sbin/sendmail/src/parseaddr.c
+++ b/usr.sbin/sendmail/src/parseaddr.c
@@ -33,7 +33,7 @@
*/
#ifndef lint
-static char sccsid[] = "@(#)parseaddr.c 8.1 (Berkeley) 6/27/93";
+static char sccsid[] = "@(#)parseaddr.c 8.3 (Berkeley) 7/11/93";
#endif /* not lint */
# include "sendmail.h"
@@ -142,7 +142,7 @@ parseaddr(addr, a, copyf, delim, delimptr, e)
if (pvp[0] == NULL || (pvp[0][0] & 0377) != CANONNET)
{
setstat(EX_USAGE);
- syserr("554 cannot resolve name");
+ syserr("554 cannot resolve name %s", addr);
return (NULL);
}
@@ -1504,12 +1504,14 @@ printaddr(a, follow)
printf("%s:\n\tmailer %d (%s), host `%s', user `%s', ruser `%s'\n",
a->q_paddr, m->m_mno, m->m_name,
- a->q_host, a->q_user, a->q_ruser? a->q_ruser: "<null>");
+ a->q_host, a->q_user,
+ a->q_ruser ? a->q_ruser : "<null>");
printf("\tnext=%x, flags=%o, alias %x, uid %d, gid %d\n",
a->q_next, a->q_flags, a->q_alias, a->q_uid, a->q_gid);
printf("\towner=%s, home=\"%s\", fullname=\"%s\"\n",
a->q_owner == NULL ? "(none)" : a->q_owner,
- a->q_home, a->q_fullname);
+ a->q_home == NULL ? "(none)" : a->q_home,
+ a->q_fullname == NULL ? "(none)" : a->q_fullname);
if (!follow)
return;