X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Fslocal.c;h=d97af9084ba3442a7667ac9bee7c19b067c34c5f;hb=83e04675b53374a1436029a367283d6d4ee05a07;hp=813a3b59a52927917c59cb297064ce5caa0b314e;hpb=e711cf1c50af5e151a721f6f1690474bc9ef658d;p=mmh

diff --git a/uip/slocal.c b/uip/slocal.c
index 813a3b5..d97af90 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -1318,48 +1318,27 @@ you_lose:
 		if (first) {
 			first = 0;
 			if (strncmp(buffer, "From ", i)==0) {
-#ifdef RPATHS
-				char *fp, *cp, *hp, *ep;
-#endif
+				char *fp, *cp;
 				/*
 				** get copy of envelope information
 				** ("From " line)
 				*/
 				envelope = getcpy(buffer);
 
-#ifdef RPATHS
 				/*
 				** Now create a "Return-Path:" line
 				** from the "From " line.
 				*/
-				hp = cp = strchr(fp = envelope + i, ' ');
-				while ((hp = strchr(++hp, 'r'))) {
-					if (uprf(hp, "remote from")) {
-						hp = strrchr(hp, ' ');
-						break;
-					}
-				}
-				if (hp) {
-					/*
-					** return path for UUCP style
-					** addressing
-					*/
-					ep = strchr(++hp, '\n');
-					snprintf(buffer, sizeof(buffer), "Return-Path: %.*s!%.*s\n", (int)(ep - hp), hp, (int)(cp - fp), fp);
-				} else {
-					/*
-					** return path for standard domain
-					** addressing
-					*/
-					snprintf(buffer, sizeof(buffer), "Return-Path: %.*s\n", (int)(cp - fp), fp);
-				}
+				cp = strchr(fp = envelope + i, ' ');
+				snprintf(buffer, sizeof(buffer),
+						"Return-Path: %.*s\n",
+						(int)(cp - fp), fp);
 
 				/* Add Return-Path header to message */
 				fputs(buffer, ffp);
 				if (ferror(ffp)) {
 					goto fputs_error;
 				}
-#endif
 				/* Put the delivery date in message */
 				fputs(ddate, ffp);
 				if (ferror(ffp)) {