always fold case on host names; fold case on the LHS of aliases

SCCS-vsn: usr.sbin/sendmail/src/alias.c 4.4
SCCS-vsn: usr.sbin/sendmail/src/version.c 4.28
SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 4.6

diff --git a/usr/src/usr.sbin/sendmail/src/alias.c b/usr/src/usr.sbin/sendmail/src/alias.c
index 0237bf4..05ac9ad 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/alias.c
+++ b/usr/src/usr.sbin/sendmail/src/alias.c
@@ -5,9 +5,9 @@
 # include "sendmail.h"
 
 # ifdef DBM
 # include "sendmail.h"
 
 # ifdef DBM

-SCCSID(@(#)alias.c     4.3             %G%     (with DBM));
+SCCSID(@(#)alias.c     4.4             %G%     (with DBM));

 # else DBM
 # else DBM

-SCCSID(@(#)alias.c     4.3             %G%     (without DBM));
+SCCSID(@(#)alias.c     4.4             %G%     (without DBM));

 # endif DBM
 
 /*
 # endif DBM
 
 /*


@@ -355,6 +355,7 @@ readaliases(aliasfile, init)
                        syserr("illegal alias name");
                        continue;
                }
                        syserr("illegal alias name");
                        continue;
                }

+               loweraddr(&al);

 
                /*
                **  Process the RHS.
 
                /*
                **  Process the RHS.

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index efdbd52..d2381c6 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/parseaddr.c
+++ b/usr/src/usr.sbin/sendmail/src/parseaddr.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
 # include "sendmail.h"
 

-SCCSID(@(#)parseaddr.c 4.5             %G%);
+SCCSID(@(#)parseaddr.c 4.6             %G%);

 
 /*
 **  PARSEADDR -- Parse an address
 
 /*
 **  PARSEADDR -- Parse an address


@@ -123,6 +123,14 @@ parseaddr(addr, a, copyf, delim)
                        a->q_user = newstr(a->q_user);
        }
 
                        a->q_user = newstr(a->q_user);
        }
 

+       /*
+       **  Convert host name to lower case if requested.
+       **      User name will be done later.
+       */
+
+       if (!bitnset(M_HST_UPPER, m->m_flags))
+               makelower(a->q_host);
+

        /*
        **  Compute return value.
        */
        /*
        **  Compute return value.
        */


@@ -155,8 +163,6 @@ loweraddr(a)
 {
        register MAILER *m = a->q_mailer;
 
 {
        register MAILER *m = a->q_mailer;
 

-       if (!bitnset(M_HST_UPPER, m->m_flags))
-               makelower(a->q_host);

        if (!bitnset(M_USR_UPPER, m->m_flags))
                makelower(a->q_user);
 }
        if (!bitnset(M_USR_UPPER, m->m_flags))
                makelower(a->q_user);
 }

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 0426ed6..ca562e3 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,5 +1,5 @@
 # ifndef lint
 # ifndef lint

-static char    SccsId[] = "@(#)SendMail version 4.27 of %G%";
+static char    SccsId[] = "@(#)SendMail version 4.28 of %G%";

 # endif lint
 
 # endif lint
 

-char   Version[] = "4.27";
+char   Version[] = "4.28";