convert to SMTP draft 3 -- finishing touches. Punt on the VRFY/

EXPN commands for now; they aren't required anyhow.  Move the fullname
into the address structure so it can be inherited.

SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 3.53
SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 3.34
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.64
SCCS-vsn: usr.sbin/sendmail/src/srvrsmtp.c 3.9
SCCS-vsn: usr.sbin/sendmail/src/recipient.c 3.29

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index 8ddfa71..9b445d3 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"
 

-static char    SccsId[] = "@(#)parseaddr.c     3.33.1.1        %G%";
+static char    SccsId[] = "@(#)parseaddr.c     3.34    %G%";

 
 /*
 **  PARSE -- Parse an address
 
 /*
 **  PARSE -- Parse an address

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 3c9e823..839c507 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -2,7 +2,7 @@
 # include "sendmail.h"
 # include <sys/stat.h>
 
 # include "sendmail.h"
 # include <sys/stat.h>
 

-static char SccsId[] = "@(#)recipient.c        3.28.1.1        %G%";
+static char SccsId[] = "@(#)recipient.c        3.29    %G%";

 
 /*
 **  SENDTO -- Designate a send list.
 
 /*
 **  SENDTO -- Designate a send list.


@@ -349,6 +349,8 @@ recipient(a)
                        {
                                char nbuf[MAXNAME];
 
                        {
                                char nbuf[MAXNAME];
 

+                               char nbuf[MAXNAME];
+

                                if (strcmp(a->q_user, pw->pw_name) != 0)
                                {
                                        a->q_user = newstr(pw->pw_name);
                                if (strcmp(a->q_user, pw->pw_name) != 0)
                                {
                                        a->q_user = newstr(pw->pw_name);


@@ -358,6 +360,9 @@ recipient(a)
                                a->q_uid = pw->pw_uid;
                                a->q_gid = pw->pw_gid;
                                a->q_flags |= QGOODUID;
                                a->q_uid = pw->pw_uid;
                                a->q_gid = pw->pw_gid;
                                a->q_flags |= QGOODUID;

+                               buildfname(pw->pw_gecos, pw->pw_name, nbuf);
+                               if (nbuf[0] != '\0')
+                                       a->q_fullname = newstr(nbuf);

                                fullname(pw, nbuf);
                                if (nbuf[0] != '\0')
                                        a->q_fullname = newstr(nbuf);
                                fullname(pw, nbuf);
                                if (nbuf[0] != '\0')
                                        a->q_fullname = newstr(nbuf);

diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h
index 7bfed21..13eea02 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/sendmail.h
+++ b/usr/src/usr.sbin/sendmail/src/sendmail.h
@@ -6,7 +6,7 @@
 
 # ifdef _DEFINE
 # define EXTERN
 
 # ifdef _DEFINE
 # define EXTERN

-static char SmailSccsId[] =    "@(#)sendmail.h 3.52.1.1        %G%";
+static char SmailSccsId[] =    "@(#)sendmail.h 3.53    %G%";

 # else  _DEFINE
 # define EXTERN extern
 # endif _DEFINE
 # else  _DEFINE
 # define EXTERN extern
 # endif _DEFINE


@@ -67,6 +67,7 @@ struct address
        short           q_uid;          /* user-id of receiver (if known) */
        short           q_gid;          /* group-id of receiver (if known) */
        char            *q_home;        /* home dir (local mailer only) */
        short           q_uid;          /* user-id of receiver (if known) */
        short           q_gid;          /* group-id of receiver (if known) */
        char            *q_home;        /* home dir (local mailer only) */

+       char            *q_fullname;    /* full name if known */

        char            *q_fullname;    /* full name of this person */
        time_t          q_timeout;      /* timeout for this address */
        struct address  *q_next;        /* chain */
        char            *q_fullname;    /* full name of this person */
        time_t          q_timeout;      /* timeout for this address */
        struct address  *q_next;        /* chain */

diff --git a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
index 0953d10..9dff476 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
 # include "sendmail.h"
 

-static char    SccsId[] =      "@(#)srvrsmtp.c 3.8.1.1 %G%";
+static char    SccsId[] =      "@(#)srvrsmtp.c 3.9     %G%";

 
 /*
 **  SMTP -- run the SMTP protocol.
 
 /*
 **  SMTP -- run the SMTP protocol.


@@ -191,8 +191,6 @@ smtp()
                        finis();
 
                  case CMDVRFY:         /* vrfy -- verify address */
                        finis();
 
                  case CMDVRFY:         /* vrfy -- verify address */

-                       a = sendto(p, 1, (ADDRESS *) NULL, QPSEUDO);
-                       if (Errors == 0)

                                paddrtree(a);
                        break;
 
                                paddrtree(a);
                        break;
 

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index f9e9aa4..42f03e1 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,3 +1,3 @@
-static char    SccsId[] = "@(#)SendMail version 3.63 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.64 of %G%";

 
 

-char   Version[] = "3.63 [%G%]";
+char   Version[] = "3.64 [%G%]";