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

Merge in the remaining differences from 8.6.11 to 8.6.12.

Browse Source 
Note that conf.c, although there was an import conflict, it did not
require intervention, as it was the $Id$ tag. It would have become
rev 1.8 on checkout so there's no point changing it from 1.7 to
1.1.1.3 as the "-j" option wanted to do.. Trust me.. :-)
This commit is contained in:
Peter Wemm 1995-08-17 04:57:21 +00:00
parent 7791ac4067
commit 9566ef5108
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=10090
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,9 +37,9 @@
#ifndef lint
#ifdef DAEMON
static char sccsid[] = "@(#)daemon.c 8.48.1.4 (Berkeley) 2/28/95 (with daemon mode)";
static char sccsid[] = "@(#)daemon.c 8.48.1.5 (Berkeley) 3/28/95 (with daemon mode)";
#else
static char sccsid[] = "@(#)daemon.c 8.48.1.4 (Berkeley) 2/28/95 (without daemon mode)";
static char sccsid[] = "@(#)daemon.c 8.48.1.5 (Berkeley) 3/28/95 (without daemon mode)";
#endif
#endif /* not lint */
@ -1078,7 +1078,7 @@ getauthinfo(fd)
/* get result */
p = &ibuf[0];
nleft = sizeof(ibuf - 1);
nleft = sizeof ibuf - 1;
while ((i = read(s, p, nleft)) > 0)
{
p += i;

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

@ -33,7 +33,7 @@
*/
#ifndef lint
static char sccsid[] = "@(#)deliver.c 8.84.1.3 (Berkeley) 3/5/95";
static char sccsid[] = "@(#)deliver.c 8.84.1.4 (Berkeley) 3/28/95";
#endif /* not lint */
#include "sendmail.h"
@ -1182,10 +1182,7 @@ deliver(e, firstto)
extern int DtableSize;
if (e->e_lockfp != NULL)
{
fclose(e->e_lockfp);
e->e_lockfp = NULL;
}
(void) close(fileno(e->e_lockfp));
/* child -- set up input & exec mailer */
(void) setsignal(SIGINT, SIG_IGN);

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

@ -33,7 +33,7 @@
*/
#ifndef lint
static char sccsid[] = "@(#)readcf.c 8.23.1.2 (Berkeley) 2/10/95";
static char sccsid[] = "@(#)readcf.c 8.23.1.3 (Berkeley) 3/5/95";
#endif /* not lint */
# include "sendmail.h"
@ -1354,6 +1354,7 @@ setoption(opt, val, safe, sticky, e)
syserr("readcf: Op line: %s unrecognized", val);
PrivacyFlags |= pv->pv_flag;
}
sticky = FALSE;
break;
case 'P': /* postmaster copy address for returned mail */