merge alias database with maps, expanding and changing interface;

announce mailer/host/user triple on -bv flag; don't send unsolicited
multiline HELO replies -- it breaks Pony Express; AIX portability changes

SCCS-vsn: usr.sbin/sendmail/src/version.c 6.60

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index a5cc8eb..88d2c17 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)version.c  6.59 (Berkeley) %G%";
+static char sccsid[] = "@(#)version.c  6.60 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

-char   Version[] = "ALPHA-6.59";
+char   Version[] = "ALPHA-6.60";