[1941] in Moira
pobox.pc changes
daemon@ATHENA.MIT.EDU (Mark Silis)
Thu Mar 14 15:58:40 2002
Date: Thu, 14 Mar 2002 15:58:38 -0500
From: Mark Silis <mark@MIT.EDU>
To: moiradev@MIT.EDU
Cc: admin-mitdir@MIT.EDU
Message-ID: <20020314205838.GA24769@I-fear-reorgs.MIT.EDU>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
These changes are for simply always displaying the mit.edu address and
not the forwarding address. This is in accordance with a earlier
desicion made by ITAG.
-- Mark
Index: pobox.pc
===================================================================
RCS file: /afs/athena/astaff/project/moiradev/repository/moira/gen/pobox.pc,v
retrieving revision 1.7
diff -u -r1.7 pobox.pc
--- pobox.pc 2000/11/30 23:27:47 1.7
+++ pobox.pc 2002/03/14 20:14:03
@@ -64,7 +64,7 @@
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)
{
@@ -78,35 +78,6 @@
}
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;
