← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/tomcat7/oneiric-updates

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/startup/PasswdUserDatabase.java

  • Committer: Bazaar Package Importer
  • Author(s): tony mancill
  • Date: 2011-07-25 22:58:33 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110725225833-1t773ak3y3g9utm2
Tags: 7.0.19-1
http://bugs.debian.org/634992
* Team upload.
* New upstream release.
  - Includes fix for CVE-2011-2526 (Closes: #634992)
* Remove patch for CVE-2011-2204 (included upstream).

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/catalina/startup/PasswdUserDatabase.java
31
31
 * that processes the <code>/etc/passwd</code> file on a Unix system.
32
32
 *
33
33
 * @author Craig R. McClanahan
34
 
 * @version $Id: PasswdUserDatabase.java 987920 2010-08-22 15:34:34Z markt $
 
34
 * @version $Id: PasswdUserDatabase.java 1142323 2011-07-02 21:57:12Z markt $
35
35
 */
36
36
 
37
37
public final class PasswdUserDatabase
78
78
    /**
79
79
     * Return the UserConfig listener with which we are associated.
80
80
     */
 
81
    @Override
81
82
    public UserConfig getUserConfig() {
82
83
 
83
84
        return (this.userConfig);
90
91
     *
91
92
     * @param userConfig The new UserConfig listener
92
93
     */
 
94
    @Override
93
95
    public void setUserConfig(UserConfig userConfig) {
94
96
 
95
97
        this.userConfig = userConfig;
106
108
     *
107
109
     * @param user User for which a home directory should be retrieved
108
110
     */
 
111
    @Override
109
112
    public String getHome(String user) {
110
113
 
111
114
        return homes.get(user);
116
119
    /**
117
120
     * Return an enumeration of the usernames defined on this server.
118
121
     */
 
122
    @Override
119
123
    public Enumeration<String> getUsers() {
120
124
 
121
125
        return (homes.keys());