nightmaremail

commit 796dbc19914bd6039cca7b6e19c9d38a8eb3a10f
parent 0ed82f58cd3869b3d0196b692c65685b8d1faf8b
Author: Leah Neukirchen <leah@vuxu.org>
Date:   Wed,  8 Apr 2020 23:32:39 +0200

qmail-remote: remove flagalias and flagallaliases, now useless

Diffstat:
M
qmail-remote.c
 | 
17
++++-------------

1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/qmail-remote.c b/qmail-remote.c
@@ -275,15 +275,10 @@ void smtp()
 stralloc canonhost = {0};
 stralloc canonbox = {0};
 
-void addrmangle(saout,s,flagalias)
-stralloc *saout; /* host has to be canonical, box has to be quoted */
-char *s;
-int *flagalias;
+void addrmangle(stralloc *saout, char *s)
 {
   int j;
  
-  *flagalias = 0;
- 
   j = str_rchr(s,'@');
   if (!s[j]) {
     if (!stralloc_copys(saout,s)) temp_nomem();
@@ -291,6 +286,7 @@ int *flagalias;
   }
   if (!stralloc_copys(&canonbox,s)) temp_nomem();
   canonbox.len = j;
+  /* box has to be quoted */
   if (!quote(saout,&canonbox)) temp_nomem();
   if (!stralloc_cats(saout,"@")) temp_nomem();
  
@@ -324,8 +320,6 @@ int main(int argc, char **argv)
   unsigned long random;
   char **recips;
   unsigned long prefme;
-  int flagallaliases;
-  int flagalias;
   char *relayhost;
  
   sig_pipeignore();
@@ -353,18 +347,16 @@ int main(int argc, char **argv)
   }
 
 
-  addrmangle(&sender,argv[2],&flagalias);
+  addrmangle(&sender,argv[2]);
  
   if (!saa_readyplus(&reciplist,0)) temp_nomem();
   if (ipme_init() != 1) temp_oserr();
  
-  flagallaliases = 1;
   recips = argv + 3;
   while (*recips) {
     if (!saa_readyplus(&reciplist,1)) temp_nomem();
     reciplist.sa[reciplist.len] = sauninit;
-    addrmangle(reciplist.sa + reciplist.len,*recips,&flagalias);
-    if (!flagalias) flagallaliases = 0;
+    addrmangle(reciplist.sa + reciplist.len,*recips);
     ++reciplist.len;
     ++recips;
   }
@@ -388,7 +380,6 @@ int main(int argc, char **argv)
         prefme = ip.ix[i].pref;
  
   if (relayhost) prefme = 300000;
-  if (flagallaliases) prefme = 500000;
  
   for (i = 0;i < ip.len;++i)
     if (ip.ix[i].pref < prefme)