X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=c1e937f0a97962a97e34f362e21f04a1144f22be;hb=33dc8211a72df0c27fa11220f3b27583cd1c7e49;hp=df81839d4e5c259e58e3dd2908d05004a315bda5;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index df81839..c1e937f 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -73,9 +73,6 @@ static char err[BUFSIZ];
 static char adr[BUFSIZ];
 
 
-extern boolean  username_extension_masquerading;  /* defined in mts.c */
-
-
 /*
 ** external prototypes
 */
@@ -368,8 +365,8 @@ ismymbox(struct mailname *np)
 				}
 			}
 			if (oops)
-				advise(NULL, "please fix the %s: entry in your %s file",
-					"alternate-mailboxes", mh_profile);
+				advise(NULL, "please fix the profile entry %s",
+						"alternate-mailboxes");
 		}
 	}
 
@@ -377,23 +374,23 @@ ismymbox(struct mailname *np)
 		return 0;
 
 	switch (np->m_type) {
-		case NETHOST:
-			len = strlen(cp = LocalName());
-			if (!uprf(np->m_host, cp) || np->m_host[len] != '.')
-				break;
-			goto local_test;
-
-		case UUCPHOST:
-			if (mh_strcasecmp(np->m_host, SystemName()))
-				break;  /* fall */
-		case LOCALHOST:
-local_test: ;
-			if (!mh_strcasecmp(np->m_mbox, mq.m_mbox))
-				return 1;
+	case NETHOST:
+		len = strlen(cp = LocalName());
+		if (!uprf(np->m_host, cp) || np->m_host[len] != '.')
 			break;
+		goto local_test;
 
-		default:
-			break;
+	case UUCPHOST:
+		if (mh_strcasecmp(np->m_host, SystemName()))
+			break;  /* fall */
+	case LOCALHOST:
+local_test: ;
+		if (!mh_strcasecmp(np->m_mbox, mq.m_mbox))
+			return 1;
+		break;
+
+	default:
+		break;
 	}
 
 	/*
@@ -408,22 +405,22 @@ local_test: ;
 			< (i = strlen(pp = mp->m_mbox)))
 			continue;
 		switch (mp->m_type & W_MBOX) {
-			case W_NIL:
-				if (mh_strcasecmp(cp, pp))
-					continue;
-				break;
-			case W_MBEG:
-				if (mh_strcasecmp(cp + len - i, pp))
-					continue;
-				break;
-			case W_MEND:
-				if (!uprf(cp, pp))
-					continue;
-				break;
-			case W_MBEG | W_MEND:
-				if (stringdex(pp, cp) < 0)
-					continue;
-				break;
+		case W_NIL:
+			if (mh_strcasecmp(cp, pp))
+				continue;
+			break;
+		case W_MBEG:
+			if (mh_strcasecmp(cp + len - i, pp))
+				continue;
+			break;
+		case W_MEND:
+			if (!uprf(cp, pp))
+				continue;
+			break;
+		case W_MBEG | W_MEND:
+			if (stringdex(pp, cp) < 0)
+				continue;
+			break;
 		}
 
 		if (mp->m_nohost)
@@ -434,22 +431,22 @@ local_test: ;
 			< (i = strlen(pp = mp->m_host)))
 			continue;
 		switch (mp->m_type & W_HOST) {
-			case W_NIL:
-				if (mh_strcasecmp(cp, pp))
-					continue;
-				break;
-			case W_HBEG:
-				if (mh_strcasecmp (cp + len - i, pp))
-					continue;
-				break;
-			case W_HEND:
-				if (!uprf(cp, pp))
-					continue;
-				break;
-			case W_HBEG | W_HEND:
-				if (stringdex(pp, cp) < 0)
-					continue;
-				break;
+		case W_NIL:
+			if (mh_strcasecmp(cp, pp))
+				continue;
+			break;
+		case W_HBEG:
+			if (mh_strcasecmp (cp + len - i, pp))
+				continue;
+			break;
+		case W_HEND:
+			if (!uprf(cp, pp))
+				continue;
+			break;
+		case W_HBEG | W_HEND:
+			if (stringdex(pp, cp) < 0)
+				continue;
+			break;
 		}
 		return 1;
 	}
@@ -469,7 +466,6 @@ local_test: ;
 ** everything is a valid host, and let SendMail worry about it.
 */
 
-#include <h/mts.h>
 #include <netdb.h>