Fix out-of-bounds error when incorporating email from stdin

[mmh] / sbr / mts.c

diff --git a/sbr/mts.c b/sbr/mts.c
index 7c70e46..b52740d 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -7,15 +7,13 @@
 */
 
 #include <h/mh.h>   /* for snprintf() */
-#include <h/nmh.h>
 #include <h/utils.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <pwd.h>
+#include <sys/socket.h>
 #include <netdb.h>
-
-#define NOTOK  (-1)
-#define OK     0
+#include <unistd.h>
 
 /*
 ** static prototypes
@@ -112,29 +110,7 @@ getuserinfo(void)
        ** information in the GECOS field, like phone number.
        */
        for (cp = tmp; *np != '\0' && *np != ',';) {
-#ifndef BSD42
                *cp++ = *np++;
-#else /* BSD42 */
-               /*
-               ** On BSD(-derived) systems, the system utilities that
-               ** deal with the GECOS field (finger, mail, sendmail,
-               ** etc.) translate any '&' character in it to the login name,
-               ** with the first letter capitalized.  So, for instance,
-               ** fingering a user "bob" with the GECOS field "& Jones"
-               ** would reveal him to be "In real life: Bob Jones".
-               ** Surprisingly, though, the OS doesn't do the translation
-               ** for you, so we have to do it manually here.
-               */
-               if (*np == '&') {  /* blech! */
-                       strcpy(cp, pw->pw_name);
-                       *cp = toupper(*cp);
-                       while (*cp)
-                               cp++;
-                       np++;
-               } else {
-                       *cp++ = *np++;
-               }
-#endif /* BSD42 */
        }
        *cp = '\0';
        strncpy(username, pw->pw_name, sizeof(username));