X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fmts.c;h=89ed1b64667fc146a6b6a4f8a3826653ae944b02;hp=ced0cf73e4d4a4ade5d5838077fcfb1f735a6a69;hb=0836c8000ccb34b59410ef1c15b1b7feac70ce5f;hpb=de448e64862babc8ea92d6ee3f61f68ba3915128

diff --git a/sbr/mts.c b/sbr/mts.c
index ced0cf7..89ed1b6 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -43,7 +43,6 @@ static char fullname[BUFSIZ];
 
 /* Variables for username masquerading: */
 boolean  draft_from_masquerading = FALSE;
-static boolean  mmailid_masquerading = FALSE;
 boolean  username_extension_masquerading = FALSE;  /* " from addrsbr.c */
 static char* masquerade = "";
 
@@ -96,9 +95,6 @@ mts_init(char *name)
 	if (strstr(masquerade, "draft_from") != NULL)
 		draft_from_masquerading = TRUE;
 
-	if (strstr(masquerade, "mmailid") != NULL)
-		mmailid_masquerading = TRUE;
-
 	if (strstr(masquerade, "username_extension") != NULL)
 		username_extension_masquerading = TRUE;
 }
@@ -261,10 +257,7 @@ getfullname(void)
 
 /*
 ** Find the user's username and full name, and cache them.
-** Also, handle "mmailid" username masquerading controlled from the GECOS field
-** of the passwd file.
 */
-
 static void
 getuserinfo(void)
 {
@@ -286,91 +279,35 @@ getuserinfo(void)
 	/*
 	** Get the user's real name from the GECOS field.  Stop once
 	** we hit a ',', which some OSes use to separate other 'finger'
-	** information in the GECOS field, like phone number.  Also, if
-	** mmailid masquerading is turned on due to "mmailid" appearing
-	** on the "masquerade:" line of mts.conf, stop if we hit a '<'
-	** (which should precede any ','s).
+	** information in the GECOS field, like phone number.
 	*/
+	for (cp = fullname; *np != '\0' && *np != ',';) {
 #ifndef BSD42
-	if (mmailid_masquerading)
-		/* Stop at ',' or '<'. */
-		for (cp = fullname; *np != '\0' && *np != ',' && *np != '<';
-			*cp++ = *np++)
-			continue;
-	else
-		/*
-		** Allow '<' as a legal character of the user's name.
-		** This code is basically a duplicate of the code above the
-		** "else" -- we don't collapse it down to one copy and put
-		** the mmailid_masquerading check inside the loop with "(x
-		** ? y : z)" because that's inefficient and the value'll
-		** never change while it's in there.
-		*/
-		for (cp = fullname; *np != '\0' && *np != ','; *cp++ = *np++)
-			continue;
+		*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 (mmailid_masquerading)
-		/* Stop at ',' or '<'. */
-		for (cp = fullname;
-			*np != '\0' && *np != ',' && *np != '<';) {
-			if (*np == '&') {  /* blech! */
-				strcpy(cp, pw->pw_name);
-				*cp = toupper(*cp);
-				while (*cp)
-					cp++;
-				np++;
-			} else {
-				*cp++ = *np++;
-			}
-		}
-	else
 		/*
-		** Allow '<' as a legal character of the user's name.
-		** This code is basically a duplicate of the code above the
-		** "else" -- we don't collapse it down to one copy and put
-		** the mmailid_masquerading check inside the loop with "(x
-		** ? y : z)" because that's inefficient and the value'll
-		** never change while it's in there.
+		** 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.
 		*/
-		for (cp = fullname; *np != '\0' && *np != ',';) {
-			if (*np == '&') {  /* blech! */
-				strcpy(cp, pw->pw_name);
-				*cp = toupper(*cp);
-				while (*cp)
-					cp++;
-				np++;
-			} else {
-				*cp++ = *np++;
-			}
+		if (*np == '&') {  /* blech! */
+			strcpy(cp, pw->pw_name);
+			*cp = toupper(*cp);
+			while (*cp)
+				cp++;
+			np++;
+		} else {
+			*cp++ = *np++;
 		}
 #endif /* BSD42 */
-	*cp = '\0';
-
-	if (mmailid_masquerading) {
-		/*
-		** Do mmailid processing.  The GECOS field should have
-		** the form "Full Name <fakeusername>".  For instance,
-		** "Dan Harkless <Dan.Harkless>".  Naturally, you'll want
-		** your MTA to have an alias (e.g. in /etc/aliases) from
-		** "fakeusername" to your account name.
-		*/
-		if (*np)
-			np++;
-		for (cp = username; *np && *np != '>'; *cp++ = *np++)
-			continue;
-		*cp = '\0';
 	}
-	if (!mmailid_masquerading || *np == '\0')
-		strncpy(username, pw->pw_name, sizeof(username));
+	*cp = '\0';
+	strncpy(username, pw->pw_name, sizeof(username));
 
 	/*
 	** The $SIGNATURE environment variable overrides the GECOS field's