d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cover 8.6.10 merge conflicts and warnings

Browse Source
This commit is contained in:
Paul Traina 1995-02-23 00:46:36 +00:00
parent c11cc9c931
commit 950d9f5aa8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=6652
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/sendmail/src/conf.c
View File

@ -249,9 +249,7 @@ setdefuser()
*/
bool
host_map_init(map, args)
MAP *map;
char *args;
host_map_init(MAP *map, char *args)
{
register char *p = args;
@ -917,7 +915,7 @@ getla()
/* Non Apollo stuff removed by Don Lewis 11/15/93 */
#ifndef lint
static char rcsid[] = "@(#)$Id: getloadavg.c,v 1.16 1991/06/21 12:51:15 paul Exp $";
static char rcsid[] = "@(#)$Id: conf.c,v 1.4 1994/08/05 09:14:29 davidg Exp $";
#endif /* !lint */
#ifdef apollo

3
usr.sbin/sendmail/src/daemon.c
View File

@ -1408,6 +1408,9 @@ hostnamebyanyaddr(sap)
int saveretry;
#if NAMED_BIND
/* need to make sure _res.retry is initialized before using it */
if ((_res.options & RES_INIT) == 0)
res_init();
/* shorten name server timeout to avoid higher level timeouts */
saveretry = _res.retry;
_res.retry = 3;

2
usr.sbin/sendmail/src/deliver.c
View File

@ -951,7 +951,7 @@ deliver(e, firstto)
}
errno = 0;
CurHostName = m->m_mailer;
CurHostName = host;
/*
** Deal with the special case of mail handled through an IPC

2
usr.sbin/sendmail/src/domain.c
View File

@ -522,7 +522,7 @@ getcanonname(host, hbsize, trymx)
qtype == T_ANY ? "ANY" : qtype == T_A ? "A" :
qtype == T_MX ? "MX" : "???");
ret = res_querydomain(host, *dp, C_IN, qtype,
&answer, sizeof(answer));
(u_char *) &answer, sizeof(answer));
if (ret <= 0)
{
if (tTd(8, 7))