X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=42742d296b3debe590a7ef61e894556ede7a324a;hb=67411b1f95d6ec987b4c732459e1ba8a8ac192c6;hp=77b6baa5ed7759c759b129a3f6f448a0c248e0c7;hpb=8758071f649ab5b469ca183a8c011d44e41951e2;p=mmh

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 77b6baa..42742d2 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -72,14 +72,8 @@ static char *note = NULL;
 static char err[BUFSIZ];
 static char adr[BUFSIZ];
 
-
-extern boolean  username_extension_masquerading;  /* defined in mts.c */
-
-
-/*
-** external prototypes
-*/
-char *getusername(void);
+/* static prototype */
+char *OfficialName(char *);
 
 
 char *
@@ -377,23 +371,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 +402,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 +428,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 +463,6 @@ local_test: ;
 ** everything is a valid host, and let SendMail worry about it.
 */
 
-#include <h/mts.h>
 #include <netdb.h>