[24088] in Source-Commits
/svn/athena r23692 - in trunk/athena/bin/lert: . debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Thu Apr 2 21:09:54 2009
Date: Thu, 2 Apr 2009 21:09:44 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200904030109.n3319iUT019275@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:09:43 -0400 (Thu, 02 Apr 2009)
New Revision: 23692
Modified:
trunk/athena/bin/lert/debian/changelog
trunk/athena/bin/lert/lert.c
Log:
In lert:
* Try $ATHENA_USER before using $USER.
Modified: trunk/athena/bin/lert/debian/changelog
===================================================================
--- trunk/athena/bin/lert/debian/changelog 2009-04-03 01:09:42 UTC (rev 23691)
+++ trunk/athena/bin/lert/debian/changelog 2009-04-03 01:09:43 UTC (rev 23692)
@@ -1,3 +1,9 @@
+debathena-lert (10.0.2-0debathena1) unstable; urgency=low
+
+ * Try $ATHENA_USER before using $USER.
+
+ -- Evan Broder <broder@mit.edu> Thu, 02 Apr 2009 20:17:11 -0400
+
debathena-lert (10.0.1-0debathena1) unstable; urgency=low
* Fix a double-free in the lert server. (Patch by Garry Zacheiss)
Modified: trunk/athena/bin/lert/lert.c
===================================================================
--- trunk/athena/bin/lert/lert.c 2009-04-03 01:09:42 UTC (rev 23691)
+++ trunk/athena/bin/lert/lert.c 2009-04-03 01:09:43 UTC (rev 23692)
@@ -387,17 +387,21 @@
if (type == LERT_Z || type == LERT_MAIL)
{
- struct passwd *pw;
+ user = getenv("ATHENA_USER");
+ if(!user)
+ user = getenv("USER");
- pw = getpwuid(getuid());
- if (pw)
- user = pw->pw_name;
- else
- {
- user = getenv("USER");
- if (!user)
- user = getlogin();
+ if(!user)
+ user = getlogin();
+
+ if(!user)
+ {
+ struct passwd *pw;
+ pw = getpwuid(getuid());
+ if (pw)
+ user = pw->pw_name;
}
+
if (!user)
type = LERT_CAT;
}
