[24096] in Source-Commits
/svn/athena r23701 - in trunk/athena/bin/mitmailscan: . debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Thu Apr 2 21:11:53 2009
Date: Thu, 2 Apr 2009 21:11:43 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200904030111.n331BhTk019713@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-04-02 21:11:43 -0400 (Thu, 02 Apr 2009)
New Revision: 23701
Modified:
trunk/athena/bin/mitmailscan/debian/changelog
trunk/athena/bin/mitmailscan/mitmailscan.pl
Log:
In mitmailscan:
* Try $ATHENA_USER before using $USER.
Modified: trunk/athena/bin/mitmailscan/debian/changelog
===================================================================
--- trunk/athena/bin/mitmailscan/debian/changelog 2009-04-03 01:11:29 UTC (rev 23700)
+++ trunk/athena/bin/mitmailscan/debian/changelog 2009-04-03 01:11:43 UTC (rev 23701)
@@ -1,3 +1,9 @@
+debathena-mitmailscan (10.0.1-0debathena1) unstable; urgency=low
+
+ * Try $ATHENA_USER before using $USER.
+
+ -- Evan Broder <broder@mit.edu> Thu, 02 Apr 2009 21:02:53 -0400
+
debathena-mitmailscan (10.0.0-0debathena2) unstable; urgency=low
* Change DEB_AUTO_UPDATE_AUTOCONF to 2.50, not 1.
Modified: trunk/athena/bin/mitmailscan/mitmailscan.pl
===================================================================
--- trunk/athena/bin/mitmailscan/mitmailscan.pl 2009-04-03 01:11:29 UTC (rev 23700)
+++ trunk/athena/bin/mitmailscan/mitmailscan.pl 2009-04-03 01:11:43 UTC (rev 23701)
@@ -131,7 +131,7 @@
$opt_mailbox = 'INBOX' unless $opt_mailbox;
$opt_search_key = 'ALL' unless $opt_search_key;
-my $username = $ENV{'USER'} || getlogin || (getpwuid($<))[0] ||
+my $username = $ENV{'ATHENA_USER'} || $ENV{'USER'} || getlogin || (getpwuid($<))[0] ||
errorout "Cannot determine user name";
unless ($opt_host) {
