BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / sendmail / src / srvrsmtp.c

diff --git a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
index be10e03..b33a1ef 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
@@ -3,28 +3,42 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 # include "sendmail.h"
 
 #ifndef lint
 #ifdef SMTP
  */
 
 # include "sendmail.h"
 
 #ifndef lint
 #ifdef SMTP

-static char sccsid[] = "@(#)srvrsmtp.c 5.28 (Berkeley) 6/1/90 (with SMTP)";
+static char sccsid[] = "@(#)srvrsmtp.c 5.31 (Berkeley) 5/10/91 (with SMTP)";

 #else
 #else

-static char sccsid[] = "@(#)srvrsmtp.c 5.28 (Berkeley) 6/1/90 (without SMTP)";
+static char sccsid[] = "@(#)srvrsmtp.c 5.31 (Berkeley) 5/10/91 (without SMTP)";

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


@@ -103,7 +117,7 @@ smtp()
        register char *p;
        register struct cmd *c;
        char *cmd;
        register char *p;
        register struct cmd *c;
        char *cmd;

-       extern char *skipword();
+       static char *skipword();

        bool hasmail;                   /* mail command received */
        auto ADDRESS *vrfyqueue;
        ADDRESS *a;
        bool hasmail;                   /* mail command received */
        auto ADDRESS *vrfyqueue;
        ADDRESS *a;


@@ -201,7 +215,8 @@ smtp()
                                 * didn't know about alias,
                                 * or connected to an echo server
                                 */
                                 * didn't know about alias,
                                 * or connected to an echo server
                                 */

-                               message("553", "Local configuration error, hostname not recognized as local");
+                               message("553", "%s config error: mail loops back to myself",
+                                       MyHostName);

                                break;
                        }
                        if (RealHostName != NULL && strcasecmp(p, RealHostName))
                                break;
                        }
                        if (RealHostName != NULL && strcasecmp(p, RealHostName))


@@ -413,8 +428,6 @@ smtp()
                        break;
 
                  case CMDHELP:         /* help -- give user info */
                        break;
 
                  case CMDHELP:         /* help -- give user info */

-                       if (*p == '\0')
-                               p = "SMTP";

                        help(p);
                        break;
 
                        help(p);
                        break;
 


@@ -554,8 +567,12 @@ help(topic)
                return;
        }
 
                return;
        }
 

+       if (topic == NULL || *topic == '\0')
+               topic = "smtp";
+       else
+               makelower(topic);
+

        len = strlen(topic);
        len = strlen(topic);

-       makelower(topic);

        noinfo = TRUE;
 
        while (fgets(buf, sizeof buf, hf) != NULL)
        noinfo = TRUE;
 
        while (fgets(buf, sizeof buf, hf) != NULL)