Fold in changes to files no longer on the vendor branch from 8.7.3 update.

5 files changed, 18 insertions, 14 deletions

diff --git a/usr.sbin/sendmail/src/conf.h b/usr.sbin/sendmail/src/conf.h
index 30bb9d1..9ac4d8f 100644
--- a/usr.sbin/sendmail/src/conf.h
+++ b/usr.sbin/sendmail/src/conf.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)conf.h	8.219 (Berkeley) 11/11/95
+ *	@(#)conf.h	8.220 (Berkeley) 11/29/95
  */
 
 /*
@@ -216,6 +216,7 @@ extern void	hard_syslog(int, char *, ...);
 
 #ifdef _AIX3
 # include <paths.h>
+# include <sys/machine.h>	/* to get byte order */
 # define HASINITGROUPS	1	/* has initgroups(3) call */
 # define HASUNAME	1	/* use System V uname(2) system call */
 # define HASGETUSERSHELL 0	/* does not have getusershell(3) call */
@@ -677,6 +678,7 @@ extern int		errno;
 # define SYSTEM5	1	/* include all the System V defines */
 # define SYS5SIGNALS	1	/* SysV signal semantics -- reset on each sig */
 # define HASGETUSERSHELL 0	/* does not have getusershell(3) call */
+# define NOFTRUNCATE	0	/* does not have ftruncate(3) call */
 # define NEEDFSYNC	1	/* needs the fsync(2) call stub */
 # define FORK		fork
 # define MAXPATHLEN	PATHSIZE
diff --git a/usr.sbin/sendmail/src/daemon.c b/usr.sbin/sendmail/src/daemon.c
index c2f5327..4bb9a99 100644
--- a/usr.sbin/sendmail/src/daemon.c
+++ b/usr.sbin/sendmail/src/daemon.c
@@ -37,9 +37,9 @@
 
 #ifndef lint
 #ifdef DAEMON
-static char sccsid[] = "@(#)daemon.c	8.118 (Berkeley) 10/8/95 (with daemon mode)";
+static char sccsid[] = "@(#)daemon.c	8.119 (Berkeley) 11/29/95 (with daemon mode)";
 #else
-static char sccsid[] = "@(#)daemon.c	8.118 (Berkeley) 10/8/95 (without daemon mode)";
+static char sccsid[] = "@(#)daemon.c	8.119 (Berkeley) 11/29/95 (without daemon mode)";
 #endif
 #endif /* not lint */
 
@@ -1034,10 +1034,10 @@ myhostname(hostbuf, size)
 	    !getcanonname(hostbuf, size, TRUE))
 	{
 #ifdef LOG
-		syslog(LOG_CRIT, "My unqualifed host name (%s) unknown; sleeping for retry",
+		syslog(LOG_CRIT, "My unqualified host name (%s) unknown; sleeping for retry",
 			hostbuf);
 #endif
-		message("My unqualifed host name (%s) unknown; sleeping for retry",
+		message("My unqualified host name (%s) unknown; sleeping for retry",
 			hostbuf);
 		sleep(60);
 		if (!getcanonname(hostbuf, size, TRUE))
diff --git a/usr.sbin/sendmail/src/parseaddr.c b/usr.sbin/sendmail/src/parseaddr.c
index debccdf..bea7184 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.86 (Berkeley) 9/28/95";
+static char sccsid[] = "@(#)parseaddr.c	8.87 (Berkeley) 11/29/95";
 #endif /* not lint */
 
 # include "sendmail.h"
@@ -888,8 +888,8 @@ rewrite(pvp, ruleset, reclevel, e)
 				ap = macvalue(rp[1], e);
 				mlp->first = avp;
 				if (tTd(21, 2))
-					printf("rewrite: LHS $&%c => \"%s\"\n",
-						rp[1],
+					printf("rewrite: LHS $&%s => \"%s\"\n",
+						macname(rp[1]),
 						ap == NULL ? "(NULL)" : ap);
 
 				if (ap == NULL)
@@ -1060,8 +1060,8 @@ rewrite(pvp, ruleset, reclevel, e)
 				{
 					*avp = macvalue(rp[1], e);
 					if (tTd(21, 2))
-						printf("rewrite: RHS $&%c => \"%s\"\n",
-							rp[1],
+						printf("rewrite: RHS $&%s => \"%s\"\n",
+							macname(rp[1]),
 							*avp == NULL ? "(NULL)" : *avp);
 					if (*avp != NULL)
 						avp++;
diff --git a/usr.sbin/sendmail/src/readcf.c b/usr.sbin/sendmail/src/readcf.c
index 4811e6d..b41c8ac 100644
--- a/usr.sbin/sendmail/src/readcf.c
+++ b/usr.sbin/sendmail/src/readcf.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)readcf.c	8.138 (Berkeley) 11/20/95";
+static char sccsid[] = "@(#)readcf.c	8.139 (Berkeley) 11/29/95";
 #endif /* not lint */
 
 # include "sendmail.h"
@@ -935,6 +935,8 @@ makemailer(line)
 
 		  case 'L':		/* maximum line length */
 			m->m_linelimit = atoi(p);
+			if (m->m_linelimit < 0)
+				m->m_linelimit = 0;
 			break;
 
 		  case 'N':		/* run niceness */
diff --git a/usr.sbin/sendmail/src/udb.c b/usr.sbin/sendmail/src/udb.c
index bb83bef..9212bb4 100644
--- a/usr.sbin/sendmail/src/udb.c
+++ b/usr.sbin/sendmail/src/udb.c
@@ -36,9 +36,9 @@
 
 #ifndef lint
 #if USERDB
-static char sccsid [] = "@(#)udb.c	8.32 (Berkeley) 11/18/95 (with USERDB)";
+static char sccsid [] = "@(#)udb.c	8.33 (Berkeley) 11/29/95 (with USERDB)";
 #else
-static char sccsid [] = "@(#)udb.c	8.32 (Berkeley) 11/18/95 (without USERDB)";
+static char sccsid [] = "@(#)udb.c	8.33 (Berkeley) 11/29/95 (without USERDB)";
 #endif
 #endif
 
@@ -356,7 +356,7 @@ udbexpand(a, sendq, aliaslevel, e)
 					}
 					if (tTd(28, 2))
 						printf("hes_getmailhost(%s): %d\n",
-							a->q_user, hes_error();
+							a->q_user, hes_error());
 					continue;
 				}
 				sprintf(info.data, "%s@%s",