commit 2a9b49611c793c9da0d863c56e304afd309a7e98

Author: Devaraj Das <ddas@yahoo-inc.com>
Date:   Fri Mar 19 01:10:57 2010 -0700

    MAPREDUCE:1532 from https://issues.apache.org/jira/secure/attachment/12439248/1532-bp20.4.2.patch
    
    +++ b/YAHOO-CHANGES.txt
    +    MAPREDUCE-1532. Fixes a javadoc and an exception message in JobInProgress
    +    when the authenticated user is different from the user in conf. (ddas)
    +


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-patches@1077341 13f79535-47bb-0310-9956-ffa450edef68

src/mapred/org/apache/hadoop/mapred/JobInProgress.java

@@ -360,8 +360,9 @@ public class JobInProgress {
       this.conf.setUser(user);
     }
     if (!conf.getUser().equals(user)) {
-      String desc = "The username obtained from the conf doesn't " +
-                      "match the username the user authenticated as";
+      String desc = "The username " + conf.getUser() + " obtained from the " +
+      		"conf doesn't match the username " + user + " the user " +
+      				"authenticated as";
       AuditLogger.logFailure(user, 
           QueueManager.QueueOperation.SUBMIT_JOB.name(), conf.getUser(), 
           jobId.toString(), desc);

src/mapred/org/apache/hadoop/mapreduce/JobContext.java

@@ -67,6 +67,9 @@ public class JobContext {
   public static final String USER_LOG_RETAIN_HOURS = 
     "mapred.userlog.retain.hours";
   
+  /**
+   * The UserGroupInformation object that has a reference to the current user
+   */
   protected UserGroupInformation ugi;
   
   public JobContext(Configuration conf, JobID jobId) {