Always reports email addresses of the form username@MIT.EDU, regardless

of user's mail forwarding.

diff --git a/gen/pobox.pc b/gen/pobox.pc
index 78bf157b8e763d1ea6e993d1ed6babcc9b90774c..a1ee2ab015f2f6376cd3442f0f63369b0b25536d 100644 (file)
--- a/gen/pobox.pc
+++ b/gen/pobox.pc
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
 
   EXEC SQL DECLARE x CURSOR FOR SELECT
     clearid, login
-    FROM users WHERE status != 3 AND potype != 'NONE' AND potype != 'SMTP';
+    FROM users WHERE status != 3 AND potype != 'NONE';
   EXEC SQL OPEN x;
   while (1)
     {
@@ -79,35 +79,6 @@ int main(int argc, char **argv)
 
   EXEC SQL CLOSE x;
 
-  EXEC SQL DECLARE y CURSOR FOR SELECT
-    u.clearid, s.string
-    FROM users u, strings s
-    WHERE u.status != 3 and u.potype = 'SMTP' and u.box_id = s.string_id;
-  EXEC SQL OPEN y;
-  while (1)
-    {
-      EXEC SQL FETCH y INTO :id, :string;
-      if (sqlca.sqlcode)
-       break;
-      strtrim(string);
-      strtrim(id);
-      if (isdigit(id[0]))
-       {
-         if ((i = strlen(string)) > 7 &&
-             !strcasecmp(".local", string + i - 6))
-           {
-             string[i - 6] = '\0';
-             fprintf(out, "%s %s.mit.edu\n", id, string);
-           }
-         else if (!strchr(string, '@'))
-           fprintf(out, "%s %s@mit.edu\n", id, string);
-         else
-           fprintf(out, "%s %s\n", id, string);
-       }
-    }
-
-  EXEC SQL CLOSE y;
-
   EXEC SQL COMMIT;
 
   if (fclose(out))